From ccbe3c9e73baf3c522812792473f482a86e530cc Mon Sep 17 00:00:00 2001 From: Kristi Nikolla Date: Fri, 12 May 2017 12:48:36 -0400 Subject: [PATCH] Update Devstack plugin to use KEYSTONE_AUTH_URI Devstack was updated to not use a new port for each service but use 80 and 443 for all services. This breaks our Devstack plugin which relies on port 5000. This updated the Devstack plugin to use the variable in Devstack that points to the correct URI for keystone. Change-Id: I07bb7ca10818e72803a783cbc16ebbfe42af5644 --- devstack/mixmatch.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/devstack/mixmatch.sh b/devstack/mixmatch.sh index 709be64..f0a70fd 100644 --- a/devstack/mixmatch.sh +++ b/devstack/mixmatch.sh @@ -31,8 +31,7 @@ function configure_mixmatch { iniset $MIXMATCH_CONF DEFAULT service_providers default iniset $MIXMATCH_CONF DEFAULT aggregation False - iniset $MIXMATCH_CONF auth auth_url \ - "$KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:5000/v3" + iniset $MIXMATCH_CONF auth auth_url "$KEYSTONE_AUTH_URI/v3" iniset $MIXMATCH_CONF auth username admin iniset $MIXMATCH_CONF auth user_domain_id default iniset $MIXMATCH_CONF auth project_name admin @@ -40,8 +39,7 @@ function configure_mixmatch { iniset $MIXMATCH_CONF auth password $ADMIN_PASSWORD iniset $MIXMATCH_CONF sp_default sp_name default - iniset $MIXMATCH_CONF sp_default auth_url \ - "$KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:5000/v3" + iniset $MIXMATCH_CONF sp_default auth_url "$KEYSTONE_AUTH_URI/v3" iniset $MIXMATCH_CONF sp_default image_endpoint \ "$GLANCE_SERVICE_PROTOCOL://$GLANCE_HOSTPORT" iniset $MIXMATCH_CONF sp_default volume_endpoint \