From 3a72a280963e887b4204540272abafb89e3518b2 Mon Sep 17 00:00:00 2001
From: Eli Qiao <liyong.qiao@intel.com>
Date: Tue, 29 Dec 2015 16:29:20 +0800
Subject: [PATCH] Devstack: Fix typo of MANGUM_GUEST_IMAGE_URL

s/MANGUM_GUEST_IMAGE_URL/MAGNUM_GUEST_IMAGE_URL

Closes-Bug: #1529786
Change-Id: I1dc5c6f5fff9fc1507d4b346c72a928c87297c3f
---
 devstack/lib/magnum | 6 +++---
 devstack/plugin.sh  | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/devstack/lib/magnum b/devstack/lib/magnum
index effe159182..f78e1030ac 100644
--- a/devstack/lib/magnum
+++ b/devstack/lib/magnum
@@ -235,16 +235,16 @@ function init_magnum {
 function magnum_register_image {
     local magnum_image_property="--property os_distro="
 
-    local atomic="$(echo $MANGUM_GUEST_IMAGE_URL | grep -o 'atomic' || true;)"
+    local atomic="$(echo $MAGNUM_GUEST_IMAGE_URL | grep -o 'atomic' || true;)"
     if [ ! -z $atomic ]; then
         magnum_image_property=$magnum_image_property"fedora-atomic"
     fi
-    local ubuntu="$(echo $MANGUM_GUEST_IMAGE_URL | grep -o "ubuntu" || ture;)"
+    local ubuntu="$(echo $MAGNUM_GUEST_IMAGE_URL | grep -o "ubuntu" || ture;)"
     if [ ! -z $ubuntu ]; then
         magnum_image_property=$magnum_image_property"ubuntu"
     fi
 
-    openstack --os-url $GLANCE_SERVICE_PROTOCOL://$GLANCE_HOSTPORT --os-image-api-version 1 image set $(basename "$MANGUM_GUEST_IMAGE_URL" ".qcow2") $magnum_image_property
+    openstack --os-url $GLANCE_SERVICE_PROTOCOL://$GLANCE_HOSTPORT --os-image-api-version 1 image set $(basename "$MAGNUM_GUEST_IMAGE_URL" ".qcow2") $magnum_image_property
 }
 
 # install_magnumclient() - Collect source and prepare
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index da75f403e8..390f9c820a 100755
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -18,8 +18,8 @@ if is_service_enabled m-api m-cond; then
 
         # add image to glance
         if [[ "$ENABLED_SERVICES" =~ 'm-api' ]]; then
-            MANGUM_GUEST_IMAGE_URL=${MANGUM_GUEST_IMAGE_URL:-"https://fedorapeople.org/groups/magnum/fedora-21-atomic-5.qcow2"}
-            IMAGE_URLS+=",${MANGUM_GUEST_IMAGE_URL}"
+            MAGNUM_GUEST_IMAGE_URL=${MAGNUM_GUEST_IMAGE_URL:-"https://fedorapeople.org/groups/magnum/fedora-21-atomic-5.qcow2"}
+            IMAGE_URLS+=",${MAGNUM_GUEST_IMAGE_URL}"
         fi
 
         LIBS_FROM_GIT="${LIBS_FROM_GIT},python-magnumclient"