From 4c9fbc0e6c652d4c5f3a57695b014a2a084b18e6 Mon Sep 17 00:00:00 2001
From: Jeremy Freudberg <jeremyfreudberg@gmail.com>
Date: Mon, 3 Jul 2017 12:17:51 -0400
Subject: [PATCH] Always use the right Glance endpoint

$GLANCE_URL will correctly be host/image if Glance runs under uwsgi,
which is now the default Devstack behavior, and otherwise the legacy
host:9292.

Change-Id: I2d8ff41a1a7826d6c81f8c6d29288f4e764668e0
---
 devstack/mixmatch.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/devstack/mixmatch.sh b/devstack/mixmatch.sh
index 954be81..4d934a1 100644
--- a/devstack/mixmatch.sh
+++ b/devstack/mixmatch.sh
@@ -37,8 +37,7 @@ function configure_mixmatch {
 
     iniset $MIXMATCH_CONF sp_default sp_name default
     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 image_endpoint $GLANCE_URL
     iniset $MIXMATCH_CONF sp_default volume_endpoint \
         "$CINDER_SERVICE_PROTOCOL://$CINDER_SERVICE_HOST:$CINDER_SERVICE_PORT"