From 70fbd7254104ba06d74930d54b2fb20b96339b8a Mon Sep 17 00:00:00 2001 From: ptoohill1 Date: Mon, 11 Jan 2016 12:16:00 -0600 Subject: [PATCH] Update admin auth data for devstack Our gate need the proper admin auth data set up in the proper configs. In this case the neutron.conf Update neutron.conf with the admin data so gates can pass. Change-Id: Iac87674ca94bcabc3047c9a3679e1385cf1c8d63 --- devstack/plugin.sh | 9 ++++++++- devstack/settings | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/devstack/plugin.sh b/devstack/plugin.sh index cb47a63a1..d8b03b2cb 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -48,13 +48,20 @@ function neutron_lbaas_configure_common { iniset $NEUTRON_CONF DEFAULT service_plugins $Q_SERVICE_PLUGIN_CLASSES fi - # Ensure config is set up properly for authentication + # Ensure config is set up properly for authentication neutron-lbaas iniset $NEUTRON_LBAAS_CONF service_auth auth_uri $AUTH_URI iniset $NEUTRON_LBAAS_CONF service_auth admin_tenant_name $ADMIN_TENANT_NAME iniset $NEUTRON_LBAAS_CONF service_auth admin_user $ADMIN_USER iniset $NEUTRON_LBAAS_CONF service_auth admin_password $ADMIN_PASSWORD iniset $NEUTRON_LBAAS_CONF service_auth auth_version $AUTH_VERSION + # Ensure config is set up properly for authentication neutron + iniset $NEUTRON_CONF service_auth auth_uri $AUTH_URI + iniset $NEUTRON_CONF service_auth admin_tenant_name $ADMIN_TENANT_NAME + iniset $NEUTRON_CONF service_auth admin_user $ADMIN_USER + iniset $NEUTRON_CONF service_auth admin_password $ADMIN_PASSWORD + iniset $NEUTRON_CONF service_auth auth_version $AUTH_VERSION + _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 150d07ff8..c77f74204 100644 --- a/devstack/settings +++ b/devstack/settings @@ -16,7 +16,7 @@ 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"} +AUTH_VERSION=${AUTH_VERSION:-"2"} LBAAS_AGENT_CONF_PATH=/etc/neutron/services/loadbalancer/haproxy LBAAS_AGENT_CONF_FILENAME=$LBAAS_AGENT_CONF_PATH/lbaas_agent.ini