From 06d5639acb1a50b8a04f1d7c3204624cffac5748 Mon Sep 17 00:00:00 2001
From: Richard Maw <richard.maw@codethink.co.uk>
Date: Thu, 19 Feb 2015 00:04:36 +0000
Subject: 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.
---
 .../openstack-neutron-network-configuration-for-one-node  | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

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
-- 
cgit v1.2.1