From d978263786e4011023008b6ea719918cfca0d25a Mon Sep 17 00:00:00 2001 From: minwang Date: Fri, 26 Jun 2015 15:14:38 -0700 Subject: [PATCH] Add content for octavia in plugin.sh and settings The purpose is to make sure the service provider is pointing to octavia instead of lbaas v2. Change-Id: I2b315edae15606b0706e49e123db067d7cd67056 --- devstack/plugin.sh | 8 +++++++- devstack/settings | 5 ++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/devstack/plugin.sh b/devstack/plugin.sh index 54ee64bb9e..f93ffd0723 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -174,7 +174,12 @@ function octavia_stop { pids=$(ps aux | awk '/haproxy/ { print $2 }') [ ! -z "$pids" ] && sudo kill $pids } - +function octavia_configure_common { + if is_service_enabled $OCTAVIA_SERVICE; then + inicomment $NEUTRON_LBAAS_CONF service_providers service_provider + iniadd $NEUTRON_LBAAS_CONF service_providers service_provider $OCTAVIA_SERVICE_PROVIDER + fi +} function octavia_cleanup { if [ ${OCTAVIA_AMP_IMAGE_NAME}x != x ] ; then @@ -213,6 +218,7 @@ if is_service_enabled $OCTAVIA; then # Configure after the other layer 1 and 2 services have been configured # TODO: need to make sure this runs after LBaaS V2 configuration echo_summary "Configuring octavia" + octavia_configure_common octavia_configure elif [[ "$1" == "stack" && "$2" == "extra" ]]; then diff --git a/devstack/settings b/devstack/settings index 635c1f20f2..fe1008f2af 100644 --- a/devstack/settings +++ b/devstack/settings @@ -49,6 +49,9 @@ OCTAVIA_API="o-api" OCTAVIA_CONSUMER="o-cw" OCTAVIA_HOUSEKEEPER="o-hk" OCTAVIA_HEALTHMANAGER="o-hm" - +OCTAVIA_SERVICE="octavia" +NEUTRON_LBAAS_DIR=$DEST/neutron-lbaas +NEUTRON_LBAAS_CONF=$NEUTRON_CONF_DIR/neutron_lbaas.conf +OCTAVIA_SERVICE_PROVIDER=${OCTAVIA_SERVICE_PROVIDER:-"LOADBALANCERV2:Octavia:neutron_lbaas.drivers.octavia.driver.OctaviaDriver:default"} Q_SVC=${Q_SVC:-"q-svc"} LBAAS_V2=${LBAAS_V2:-"q-lbaasv2"}