summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Maw <richard.maw@codethink.co.uk>2015-02-24 10:18:28 +0000
committerRichard Maw <richard.maw@codethink.co.uk>2015-03-09 11:47:24 +0000
commit6fc31278a4e46710d197c81edf47505c713a4afd (patch)
tree2b504f8bc94be93089baf5ab5ab140a5a34e56b7
parent68eb71d186116be75929e0d9841b36db7de29a73 (diff)
downloaddefinitions-6fc31278a4e46710d197c81edf47505c713a4afd.tar.gz
Disable DHCP on bound iface and internal ifaces
-rw-r--r--openstack/usr/share/openstack/openstack-neutron-network-configuration-for-one-node7
1 files 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