openstack/neutron-lbaas
Code Issues Proposed changes

Merge "Replace auth_uri option with auth_url in DevStack plugin"

Browse Source
This commit is contained in:
Jenkins 2016-07-06 16:36:30 +00:00 committed by Gerrit Code Review
commit 920a0f5028
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devstack/plugin.sh
View File

@ -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

2
devstack/settings
View File

@ -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"}