1. devstack
  2. Commit f1a794e1326b79aa5c5e67530f2169479b9bf1f2
Browse code

flat_networks - Don't hardcode public network name

Use the PUBLIC_NETWORK_NAME variable instead of hardcoding
it when setting the [ml2_type_flat]/flat_networks option.

Change-Id: I8bfc37089ec90eb06ee41d85744dad0f3f734c16

Harald Jensås authored on 2019/08/21 17:49:57
Showing 1 changed files
lib/neutron
History View file @ f1a794e
... ... 
@@ -225,7 +225,7 @@ function configure_neutron_new {
225 225 
         iniset $NEUTRON_CORE_PLUGIN_CONF ml2 mechanism_drivers $mech_drivers
226 226
227 227 
         iniset $NEUTRON_CORE_PLUGIN_CONF ml2_type_vxlan vni_ranges 1001:2000
228 
-        iniset $NEUTRON_CORE_PLUGIN_CONF ml2_type_flat flat_networks public
228 
+        iniset $NEUTRON_CORE_PLUGIN_CONF ml2_type_flat flat_networks $PUBLIC_NETWORK_NAME
229 229 
         if [[ "$NEUTRON_TENANT_NETWORK_TYPE" =~ "vlan" ]] && [[ "$NEUTRON_PHYSICAL_NETWORK" != "" ]]; then
230 230 
             iniset $NEUTRON_CORE_PLUGIN_CONF ml2_type_vlan network_vlan_ranges ${NEUTRON_PHYSICAL_NETWORK}:${NEUTRON_TENANT_VLAN_RANGE}
231 231 
         fi