From 8905f9b0761fb19489cc0ef5ade1c39223b3f966 Mon Sep 17 00:00:00 2001
From: Richard Ipsum <richard.ipsum@codethink.co.uk>
Date: Wed, 15 Apr 2015 12:19:00 +0100
Subject: Make openstack dhcp settings lower priority

These settings were conflicting with those set
by the simple-network configure extension

Change-Id: I6a08bfe22a1da76c4cad9584589e33b90c68bf77
---
 openstack/manifest                                          | 2 +-
 openstack/usr/share/openstack/extras/10-device-dhcp.network | 5 -----
 openstack/usr/share/openstack/extras/60-device-dhcp.network | 5 +++++
 openstack/usr/share/openstack/network.yml                   | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)
 delete mode 100644 openstack/usr/share/openstack/extras/10-device-dhcp.network
 create mode 100644 openstack/usr/share/openstack/extras/60-device-dhcp.network

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/10-device-dhcp.network
deleted file mode 100644
index 6fdbfd8d..00000000
--- a/openstack/usr/share/openstack/extras/10-device-dhcp.network
+++ /dev/null
@@ -1,5 +0,0 @@
-[Match]
-Name={{ item }}
-
-[Network]
-DHCP=yes
diff --git a/openstack/usr/share/openstack/extras/60-device-dhcp.network b/openstack/usr/share/openstack/extras/60-device-dhcp.network
new file mode 100644
index 00000000..6fdbfd8d
--- /dev/null
+++ b/openstack/usr/share/openstack/extras/60-device-dhcp.network
@@ -0,0 +1,5 @@
+[Match]
+Name={{ item }}
+
+[Network]
+DHCP=yes
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
-- 
cgit v1.2.1