From 4b0dba391f04bc0ce94ff99afb2ee925691058f4 Mon Sep 17 00:00:00 2001 From: Elena Ezhova Date: Tue, 14 Jun 2016 18:01:45 +0300 Subject: [PATCH] Replace auth_uri option with auth_url in DevStack plugin auth_uri option doesn't exist, in neutron-lbaas there is an auth_url option that is used for authentication in keystone. The way how devstack deploys neutron-lbaas currently works only because AUTH_URI default value in settings file equals auth_url default value. Change-Id: I3c89760c5c475f86528cb5879b72bad8b2eab6a5 Closes-Bug: #1592438 --- devstack/plugin.sh | 4 ++-- devstack/settings | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/devstack/plugin.sh b/devstack/plugin.sh index 67f5742cc..0bc545da4 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -50,14 +50,14 @@ function neutron_lbaas_configure_common { fi # 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 auth_url $AUTH_URL 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 auth_url $AUTH_URL 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 diff --git a/devstack/settings b/devstack/settings index c77f74204..f4d9fc7d0 100644 --- a/devstack/settings +++ b/devstack/settings @@ -12,7 +12,7 @@ LBAAS_ANY="$LBAAS_V1 $LBAAS_V2" BARBICAN="barbican-svc" -AUTH_URI=${AUTH_URI:-"http://127.0.0.1:5000/v2.0"} +AUTH_URL=${AUTH_URL:-"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"}