Merge "Fix local.conf.sample once again"
This commit is contained in:
commit
c4b897262b
@ -189,8 +189,6 @@ else
|
|||||||
NEUTRON_LBAAS_SERVICE_PROVIDERV2="LOADBALANCERV2:Haproxy:neutron_lbaas.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver:default"
|
NEUTRON_LBAAS_SERVICE_PROVIDERV2="LOADBALANCERV2:Haproxy:neutron_lbaas.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver:default"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ "$KURYR_K8S_LBAAS_USE_OCTAVIA" == "True" ]]; then
|
[[post-config|$OCTAVIA_CONF]]
|
||||||
[[post-config|$OCTAVIA_CONF_DIR/octavia.conf]]
|
[controller_worker]
|
||||||
[controller_worker]
|
amp_active_retries=9999
|
||||||
amp_active_retries=9999
|
|
||||||
fi
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user