diff --git a/devstack/plugin.sh b/devstack/plugin.sh index 353147f45..cb43a41d7 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -25,6 +25,7 @@ function neutron_agent_lbaas_install_agent_packages { function neutron_lbaas_configure_common { cp $NEUTRON_LBAAS_DIR/etc/neutron_lbaas.conf.sample $NEUTRON_LBAAS_CONF + cp $NEUTRON_LBAAS_DIR/etc/services_lbaas.conf.sample $SERVICES_LBAAS_CONF inicomment $NEUTRON_LBAAS_CONF service_providers service_provider iniadd $NEUTRON_LBAAS_CONF service_providers service_provider $NEUTRON_LBAAS_SERVICE_PROVIDERV2 diff --git a/devstack/settings b/devstack/settings index 4121573ec..a0c30b71c 100644 --- a/devstack/settings +++ b/devstack/settings @@ -21,7 +21,15 @@ LBAAS_AGENT_CONF_FILENAME=$LBAAS_AGENT_CONF_PATH/lbaas_agent.ini LBAASV2_PLUGIN=${LBAASV2_PLUGIN:-"neutron_lbaas.services.loadbalancer.plugin.LoadBalancerPluginv2"} NEUTRON_LBAAS_DIR=$DEST/neutron-lbaas -NEUTRON_LBAAS_CONF=$NEUTRON_CONF_DIR/neutron_lbaas.conf + +NEUTRON_LBAAS_CONF_FILE=neutron_lbaas.conf +SERVICES_LBAAS_CONF_FILE=services_lbaas.conf + +NEUTRON_LBAAS_CONF=$NEUTRON_CONF_DIR/$NEUTRON_LBAAS_CONF_FILE +SERVICES_LBAAS_CONF=$NEUTRON_CONF_DIR/$SERVICES_LBAAS_CONF_FILE + +Q_PLUGIN_EXTRA_CONF_PATH=$NEUTRON_CONF_DIR +Q_PLUGIN_EXTRA_CONF_FILES+=($NEUTRON_LBAAS_CONF_FILE $SERVICES_LBAAS_CONF_FILE) NEUTRON_LBAAS_SERVICE_PROVIDERV2_OCTAVIA=${NEUTRON_LBAAS_SERVICE_PROVIDERV2_OCTAVIA:-"LOADBALANCERV2:Octavia:neutron_lbaas.drivers.octavia.driver.OctaviaDriver:default"}