Merge "Neutron: Do not set removed allow_overlapping_ips"
This commit is contained in:
commit
d9e2d10d28
@ -219,7 +219,6 @@ function configure_neutron_new {
|
||||
iniset $NEUTRON_CONF DEFAULT core_plugin $NEUTRON_CORE_PLUGIN
|
||||
|
||||
iniset $NEUTRON_CONF DEFAULT policy_file $policy_file
|
||||
iniset $NEUTRON_CONF DEFAULT allow_overlapping_ips True
|
||||
iniset $NEUTRON_CONF DEFAULT router_distributed $NEUTRON_DISTRIBUTED_ROUTING
|
||||
|
||||
iniset $NEUTRON_CONF DEFAULT auth_strategy $NEUTRON_AUTH_STRATEGY
|
||||
|
@ -941,7 +941,6 @@ function _configure_neutron_service {
|
||||
|
||||
iniset $NEUTRON_CONF DEFAULT debug $ENABLE_DEBUG_LOG_LEVEL
|
||||
iniset $NEUTRON_CONF oslo_policy policy_file $Q_POLICY_FILE
|
||||
iniset $NEUTRON_CONF DEFAULT allow_overlapping_ips $Q_ALLOW_OVERLAPPING_IP
|
||||
|
||||
iniset $NEUTRON_CONF DEFAULT auth_strategy $Q_AUTH_STRATEGY
|
||||
configure_keystone_authtoken_middleware $NEUTRON_CONF $Q_ADMIN_USERNAME
|
||||
|
Loading…
Reference in New Issue
Block a user