x/devstack-plugin-tobiko
Code Issues Proposed changes

DHCP is no more required for external networks

Browse Source 
Change-Id: I1c8de2114a9702649a50dff9123233b407026f9e
This commit is contained in:
Federico Ressi 2021-02-12 11:02:16 +01:00
parent 4cd8efe86e
commit 47a45a8728
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
devstack/plugin.sh
View File

@ -162,15 +162,8 @@ function configure_tobiko_neutron {
echo_summary "Write [neutron] section to ${TOBIKO_CONF_FILE}" echo_summary "Write [neutron] section to ${TOBIKO_CONF_FILE}"
local tobiko_conf_file=$1 local tobiko_conf_file=$1
if [ -n "${TOBIKO_NEUTRON_EXTERNAL_NETWORK}" ]; then iniset_nonempty "${tobiko_conf_file}" neutron external_network \
# enable DHCP on IPv4 subnet of external network "${TOBIKO_NEUTRON_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 \ iniset_nonempty "${tobiko_conf_file}" neutron floating_network \
"${TOBIKO_NEUTRON_FLOATING_NETWORK}" "${TOBIKO_NEUTRON_FLOATING_NETWORK}"
iniset_nonempty "${tobiko_conf_file}" neutron ipv4_dns_nameservers \ iniset_nonempty "${tobiko_conf_file}" neutron ipv4_dns_nameservers \