summaryrefslogtreecommitdiff
path: root/openstack/usr
diff options
context:
space:
mode:
authorRichard Maw <richard.maw@codethink.co.uk>2015-02-19 00:04:36 +0000
committerRichard Maw <richard.maw@codethink.co.uk>2015-03-20 14:45:28 +0000
commitbcdd2d1b6bfff7c80845993d3adb9a08879185ac (patch)
tree3202aa6ecde238bc4fcad9afa913a0e4449d5937 /openstack/usr
parente18f497f2adfcfd6c53644ffbaf2c8f0e191573e (diff)
downloaddefinitions-bcdd2d1b6bfff7c80845993d3adb9a08879185ac.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.
Diffstat (limited to 'openstack/usr')
-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 c2ccbd81..28a1c452 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