From 6b663e67fa802810906d4a22af286b6387b4b993 Mon Sep 17 00:00:00 2001
From: Swapnil Kulkarni <me@coolsvap.net>
Date: Wed, 29 Apr 2015 11:18:04 +0000
Subject: [PATCH] Image distro not updated when magnum configured with devstack

Updated the plugin and lib script to register image with property

Change-Id: I87fe82195c8aef3935e519185f07c43f359de4b8
Closes-Bug:#1449950
---
 devstack/lib/magnum | 7 +++++++
 devstack/plugin.sh  | 1 +
 2 files changed, 8 insertions(+)

diff --git a/devstack/lib/magnum b/devstack/lib/magnum
index f154e7a082..2c39a3bae6 100644
--- a/devstack/lib/magnum
+++ b/devstack/lib/magnum
@@ -15,6 +15,7 @@
 # - configure_magnum
 # - create_magnum_conf
 # - init_magnum
+# - magnum_register_image
 # - start_magnum
 # - stop_magnum
 # - cleanup_magnum
@@ -192,6 +193,12 @@ function init_magnum {
     create_magnum_cache_dir
 }
 
+# magnum_register_image - Register heat image for magnum with property os-distro
+function magnum_register_image {
+    local magnum_image_property="--property os-distro=fedora-atomic"
+    openstack --os-url $GLANCE_SERVICE_PROTOCOL://$GLANCE_HOSTPORT image set $(basename "$MANGUM_GUEST_IMAGE_URL" ".qcow2") $magnum_image_property
+}
+
 # install_magnumclient() - Collect source and prepare
 function install_magnumclient {
     if use_library_from_git "python-magnumclient"; then
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index e915caecc7..81d9418454 100755
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -44,6 +44,7 @@ if is_service_enabled m-api m-cond; then
     elif [[ "$1" == "stack" && "$2" == "extra" ]]; then
         # Initialize magnum
         init_magnum
+        magnum_register_image
 
         # Start the magnum API and magnum taskmgr components
         echo_summary "Starting magnum"