From 08330c2cbe859eda6218c91b983098c671a1f9bf Mon Sep 17 00:00:00 2001
From: Richard Maw <richard.maw@codethink.co.uk>
Date: Tue, 24 Feb 2015 10:18:28 +0000
Subject: Disable DHCP on bound iface and internal ifaces

---
 .../openstack/openstack-neutron-network-configuration-for-one-node | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/openstack/usr/share/openstack/openstack-neutron-network-configuration-for-one-node b/openstack/usr/share/openstack/openstack-neutron-network-configuration-for-one-node
index f40ceff5..19bb4dad 100644
--- a/openstack/usr/share/openstack/openstack-neutron-network-configuration-for-one-node
+++ b/openstack/usr/share/openstack/openstack-neutron-network-configuration-for-one-node
@@ -52,13 +52,14 @@ ip link set ex-br-proxy up promisc on
 ip link set proxy-br-eth1 up promisc on
 ip link set proxy-br-ex up promisc on
 
-# Disable dhcp on the ethernet device we've bound into Open vSwitch
+# Disable dhcp on the bound physical interface, and all the internal interfaces
 install -D -m 644 /proc/self/fd/0 <<EOF /etc/systemd/network/00-disable-$eth_dev-config.network
 [Match]
-Name=$eth_dev
+Name=$eth_dev br-eth1 br-ex eth1-br-proxy ex-br-proxy proxy-br-eth1 proxy-br-ex ovs-system
 EOF
 
-# DHCP on the Open vSwitch device
+
+# DHCP on the Open vSwitch device that replaces our external interface
 install -D -m 644 /proc/self/fd/0 <<EOF /etc/systemd/network/10-br-ex-dhcp.network
 [Match]
 Name=br-eth0
-- 
cgit v1.2.1