Browse code

Merge "flat_networks - Don't hardcode public network name"

Zuul authored on 2019/08/31 01:12:11
Showing 1 changed files
... ...
@@ -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