Merge "Add content for octavia in plugin.sh and settings"
This commit is contained in:
commit
e47c604419
@ -174,7 +174,12 @@ function octavia_stop {
|
|||||||
pids=$(ps aux | awk '/haproxy/ { print $2 }')
|
pids=$(ps aux | awk '/haproxy/ { print $2 }')
|
||||||
[ ! -z "$pids" ] && sudo kill $pids
|
[ ! -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 {
|
function octavia_cleanup {
|
||||||
|
|
||||||
if [ ${OCTAVIA_AMP_IMAGE_NAME}x != x ] ; then
|
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
|
# Configure after the other layer 1 and 2 services have been configured
|
||||||
# TODO: need to make sure this runs after LBaaS V2 configuration
|
# TODO: need to make sure this runs after LBaaS V2 configuration
|
||||||
echo_summary "Configuring octavia"
|
echo_summary "Configuring octavia"
|
||||||
|
octavia_configure_common
|
||||||
octavia_configure
|
octavia_configure
|
||||||
|
|
||||||
elif [[ "$1" == "stack" && "$2" == "extra" ]]; then
|
elif [[ "$1" == "stack" && "$2" == "extra" ]]; then
|
||||||
|
@ -49,6 +49,9 @@ OCTAVIA_API="o-api"
|
|||||||
OCTAVIA_CONSUMER="o-cw"
|
OCTAVIA_CONSUMER="o-cw"
|
||||||
OCTAVIA_HOUSEKEEPER="o-hk"
|
OCTAVIA_HOUSEKEEPER="o-hk"
|
||||||
OCTAVIA_HEALTHMANAGER="o-hm"
|
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"}
|
Q_SVC=${Q_SVC:-"q-svc"}
|
||||||
LBAAS_V2=${LBAAS_V2:-"q-lbaasv2"}
|
LBAAS_V2=${LBAAS_V2:-"q-lbaasv2"}
|
||||||
|
Loading…
Reference in New Issue
Block a user