summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Maw <richard.maw@codethink.co.uk>2015-02-19 00:04:36 (GMT)
committerRichard Maw <richard.maw@codethink.co.uk>2015-03-09 11:47:24 (GMT)
commit06d5639acb1a50b8a04f1d7c3204624cffac5748 (patch)
treebeba355e7c4b2a28605b9ee792dca9e8a514d54e
parenta405070d275132dc02435dc4d5bffee16f78e702 (diff)
downloaddefinitions-06d5639acb1a50b8a04f1d7c3204624cffac5748.tar.gz
After initial switching setup, switch DHCP to external iface
After the external interface has been bound to Open vSwitch, we should not attempt to DHCP on it, as it won't receive the DHCP responses. Attempting to DHCP results in startup stalling on network-online.target, because systemd-networkd-wait-online.service looks at every network interface it should configure based on the [Match] sections, and waits for all of them to be configured by systemd-networkd, which will never finish if DHCP is broken.
-rw-r--r--openstack/usr/share/openstack/openstack-neutron-network-configuration-for-one-node15
1 files changed, 15 insertions, 0 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 c2ccbd8..28a1c45 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
@@ -49,6 +49,21 @@ 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
+install -D -m 644 /proc/self/fd/0 <<EOF /etc/systemd/network/00-disable-$eth_dev-config.network
+[Match]
+Name=$eth_dev
+EOF
+
+# DHCP on the Open vSwitch device
+install -D -m 644 /proc/self/fd/0 <<EOF /etc/systemd/network/10-br-ex-dhcp.network
+[Match]
+Name=br-eth0
+
+[Network]
+DHCP=yes
+EOF
+
install -D -m 644 /proc/self/fd/0 <<'EOF' /var/openstack/openvswitch-one-node-setup
Openvswitch one node setup: success
EOF