From 91e056af446c8c61d756f88b5d8cbedcd6ef42d5 Mon Sep 17 00:00:00 2001
From: Federico Ressi <fressi@redhat.com>
Date: Wed, 25 Nov 2020 15:57:48 +0100
Subject: [PATCH] Add support to external network option

Change-Id: I95d1d89cbbacfb1abab6aa9d8ee088c9d6669760
---
 devstack/plugin.sh | 9 +++++++++
 devstack/settings  | 1 +
 2 files changed, 10 insertions(+)

diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 915595a..5d5287a 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -162,6 +162,15 @@ function configure_tobiko_neutron {
     echo_summary "Write [neutron] section to ${TOBIKO_CONF_FILE}"
     local tobiko_conf_file=$1
 
+    if [ -n "${TOBIKO_NEUTRON_EXTERNAL_NETWORK}" ]; then
+        # enable DHCP on IPv4 subnet of external network
+        openstack subnet list --no-dhcp --ip-version 4 -c ID -f value \
+            --network "${TOBIKO_NEUTRON_EXTERNAL_NETWORK}" | \
+            xargs -r -n 1 openstack subnet set --dhcp
+        iniset "${tobiko_conf_file}" neutron external_network \
+            "${TOBIKO_NEUTRON_EXTERNAL_NETWORK}"
+    fi
+
     iniset_nonempty "${tobiko_conf_file}" neutron floating_network \
         "${TOBIKO_NEUTRON_FLOATING_NETWORK}"
     iniset_nonempty "${tobiko_conf_file}" neutron ipv4_dns_nameservers \
diff --git a/devstack/settings b/devstack/settings
index c066400..c84c13d 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -38,6 +38,7 @@ TOBIKO_KEYSTONE_USER_ROLE=${TOBIKO_KEYSTONE_USER_ROLE:-admin}
 TOBIKO_NOVA_KEY_FILE=${TOBIKO_NOVA_KEY_FILE:-}
 
 # --- Neutron settings ---
+TOBIKO_NEUTRON_EXTERNAL_NETWORK=${TOBIKO_NEUTRON_EXTERNAL_NETWORK:-${PUBLIC_NETWORK_NAME}}
 TOBIKO_NEUTRON_FLOATING_NETWORK=${TOBIKO_NEUTRON_FLOATING_NETWORK:-${PUBLIC_NETWORK_NAME}}
 TOBIKO_NEUTRON_IPV4_DNS_NAMESERVERS=${TOBIKO_NEUTRON_IPV4_DNS_NAMESERVERS:-}
 TOBIKO_NEUTRON_IPV6_DNS_NAMESERVERS=${TOBIKO_NEUTRON_IPV6_DNS_NAMESERVERS:-}