diff options
author | Richard Ipsum <richard.ipsum@codethink.co.uk> | 2015-04-15 12:19:00 +0100 |
---|---|---|
committer | Richard Ipsum <richard.ipsum@codethink.co.uk> | 2015-04-15 13:31:19 +0100 |
commit | 8905f9b0761fb19489cc0ef5ade1c39223b3f966 (patch) | |
tree | 3c18163977727e2cc7835d24f84c2736b43a0141 | |
parent | 7c362ed24f186d94dd1b489c793b65308975fda5 (diff) | |
download | definitions-ripsum/make-os-dhcp-lower-priority.tar.gz |
Make openstack dhcp settings lower priorityripsum/make-os-dhcp-lower-priority
These settings were conflicting with those set
by the simple-network configure extension
Change-Id: I6a08bfe22a1da76c4cad9584589e33b90c68bf77
-rw-r--r-- | openstack/manifest | 2 | ||||
-rw-r--r-- | openstack/usr/share/openstack/extras/60-device-dhcp.network (renamed from openstack/usr/share/openstack/extras/10-device-dhcp.network) | 0 | ||||
-rw-r--r-- | openstack/usr/share/openstack/network.yml | 4 |
3 files changed, 3 insertions, 3 deletions
diff --git a/openstack/manifest b/openstack/manifest index bac36241..6268a1d3 100644 --- a/openstack/manifest +++ b/openstack/manifest @@ -138,7 +138,7 @@ 0100644 0 0 /usr/share/openstack/neutron/plugins/vmware/nsx.ini 0040755 0 0 /usr/share/openstack/extras 0100644 0 0 /usr/share/openstack/extras/00-disable-device.network -0100644 0 0 /usr/share/openstack/extras/10-device-dhcp.network +0100644 0 0 /usr/share/openstack/extras/60-device-dhcp.network 0100644 0 0 /usr/lib/systemd/system/openstack-neutron-setup.service 0100644 0 0 /usr/lib/systemd/system/openstack-neutron-server.service 0100644 0 0 /usr/lib/systemd/system/openstack-neutron-metadata-agent.service diff --git a/openstack/usr/share/openstack/extras/10-device-dhcp.network b/openstack/usr/share/openstack/extras/60-device-dhcp.network index 6fdbfd8d..6fdbfd8d 100644 --- a/openstack/usr/share/openstack/extras/10-device-dhcp.network +++ b/openstack/usr/share/openstack/extras/60-device-dhcp.network diff --git a/openstack/usr/share/openstack/network.yml b/openstack/usr/share/openstack/network.yml index c8ab03f7..f99f7f1a 100644 --- a/openstack/usr/share/openstack/network.yml +++ b/openstack/usr/share/openstack/network.yml @@ -61,7 +61,7 @@ - name: Enable dhcp on the Open vSwitch device that replaces our external interface template: - src: /usr/share/openstack/extras/10-device-dhcp.network - dest: /run/systemd/network/10-{{ item }}-dhcp.network + src: /usr/share/openstack/extras/60-device-dhcp.network + dest: /run/systemd/network/60-{{ item }}-dhcp.network with_items: - br-ex |