From 56bcdef52804c9bb3844898da1d4b7aeb3ebb188 Mon Sep 17 00:00:00 2001 From: Rudra Rugge Date: Fri, 25 Mar 2016 10:22:03 -0700 Subject: [PATCH] Enable only LBAASv1 for liberty 3.0.1 Enable only LBAASv1 for liberty 3.0.1 Change-Id: Ic325501ac2abf906bc139a6426c0f0d1cf0b3c6b Closes-Bug: 1561808 --- .../config/scripts/quantum-server-setup.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/contrail_provisioning/config/scripts/quantum-server-setup.sh b/contrail_provisioning/config/scripts/quantum-server-setup.sh index 25c13330..0ff70ffa 100755 --- a/contrail_provisioning/config/scripts/quantum-server-setup.sh +++ b/contrail_provisioning/config/scripts/quantum-server-setup.sh @@ -106,15 +106,19 @@ if [ -d /etc/neutron ]; then liberty_ubuntu=1 fi fi + ''' + #### Enable LBAASv2 only starting 3.0.2 if [ $is_ubuntu -eq 1 ] && [ $liberty_ubuntu -eq 1 ] ; then - # for liberty loadbalanacer plugin would be V2 by default and - # neutron_lbaas extensions would be needed in api_extensions_path openstack-config --set /etc/neutron/neutron.conf DEFAULT api_extensions_path extensions:${PYDIST}/neutron_plugin_contrail/extensions:${PYDIST}/neutron_lbaas/extensions openstack-config --set /etc/neutron/neutron.conf DEFAULT service_plugins neutron_plugin_contrail.plugins.opencontrail.loadbalancer.v2.plugin.LoadBalancerPluginV2 else openstack-config --set /etc/neutron/neutron.conf DEFAULT api_extensions_path extensions:${PYDIST}/neutron_plugin_contrail/extensions openstack-config --set /etc/neutron/neutron.conf DEFAULT service_plugins neutron_plugin_contrail.plugins.opencontrail.loadbalancer.plugin.LoadBalancerPlugin fi + #### Enable LBAASv2 only starting 3.0.2 + ''' + openstack-config --set /etc/neutron/neutron.conf DEFAULT api_extensions_path extensions:${PYDIST}/neutron_plugin_contrail/extensions + openstack-config --set /etc/neutron/neutron.conf DEFAULT service_plugins neutron_plugin_contrail.plugins.opencontrail.loadbalancer.plugin.LoadBalancerPlugin openstack-config --del /etc/neutron/neutron.conf service_providers service_provider openstack-config --set /etc/neutron/neutron.conf service_providers service_provider LOADBALANCER:Opencontrail:neutron_plugin_contrail.plugins.opencontrail.loadbalancer.driver.OpencontrailLoadbalancerDriver:default