From 254371b1213d0874fed1364ed4f54a7dda108cc3 Mon Sep 17 00:00:00 2001 From: ptoohill1 Date: Mon, 3 Aug 2015 13:43:44 -0500 Subject: [PATCH] Updating devstack plugin for authtoken Barbican expects certain values that are not populated anywhere else. Update devstack plugin to check if barbican is enabled and set those values. Change-Id: I3fc25993ce6990fe30208bf216c9c96780d8fef9 --- devstack/plugin.sh | 9 +++++++++ devstack/settings | 8 ++++++++ 2 files changed, 17 insertions(+) diff --git a/devstack/plugin.sh b/devstack/plugin.sh index 79495762f..97ba3371b 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -39,6 +39,15 @@ function neutron_lbaas_configure_common { iniset $NEUTRON_CONF DEFAULT service_plugins $Q_SERVICE_PLUGIN_CLASSES fi + if is_service_enabled $BARBICAN; then + # Ensure config is set up properly for use with barbican + iniset $NEUTRON_CONF keystone_authtoken auth_uri $AUTH_URI + iniset $NEUTRON_CONF keystone_authtoken admin_tenant_name $ADMIN_TENANT_NAME + iniset $NEUTRON_CONF keystone_authtoken admin_user $ADMIN_USER + iniset $NEUTRON_CONF keystone_authtoken admin_password $ADMIN_PASSWORD + iniset $NEUTRON_CONF keystone_authtoken auth_version $AUTH_VERSION + fi + _neutron_deploy_rootwrap_filters $NEUTRON_LBAAS_DIR $NEUTRON_BIN_DIR/neutron-db-manage --service lbaas --config-file $NEUTRON_CONF --config-file /$Q_PLUGIN_CONF_FILE upgrade head diff --git a/devstack/settings b/devstack/settings index b0561862a..b111b9b95 100644 --- a/devstack/settings +++ b/devstack/settings @@ -10,6 +10,14 @@ LBAAS_V1="q-lbaas q-lbaasv1" LBAAS_V2="q-lbaasv2" LBAAS_ANY="$LBAAS_V1 $LBAAS_V2" +BARBICAN="barbican-svc" + +AUTH_URI=${AUTH_URI:-"http://127.0.0.1:5000/v2.0"} +ADMIN_TENANT_NAME=${ADMIN_TENANT_NAME:-"admin"} +ADMIN_USER=${ADMIN_USER:-"admin"} +ADMIN_PASSWORD=${ADMIN_PASSWORD:-"password"} +AUTH_VERSION=${AUTH_VERSION:-"v2"} + LBAAS_AGENT_CONF_PATH=/etc/neutron/services/loadbalancer/haproxy LBAAS_AGENT_CONF_FILENAME=$LBAAS_AGENT_CONF_PATH/lbaas_agent.ini