From 3ba51c354c6ff8ac6b12b0fed463270badd46c5c Mon Sep 17 00:00:00 2001
From: Sergey Lukjanov <slukjanov@mirantis.com>
Date: Tue, 18 Aug 2015 01:16:42 +0300
Subject: [PATCH] Remove never executable code from devstack plugin

The HEAT_CFN_IMAGE_URL was removed from the devstack code a while
ago and so there is no need to keep this code.

Change-Id: I677d145aa42e87d55651d0ba8238e116b77b8a27
---
 devstack/plugin.sh | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 1aeb9c09..efb4e58f 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -11,7 +11,6 @@
 # install_sahara
 # install_python_saharaclient
 # configure_sahara
-# sahara_register_images
 # start_sahara
 # stop_sahara
 # cleanup_sahara
@@ -172,17 +171,6 @@ function install_python_saharaclient {
     fi
 }
 
-# sahara_register_images() - Registers images in sahara image registry
-function sahara_register_images {
-    if is_service_enabled heat && [[ ! -z "$HEAT_CFN_IMAGE_URL" ]]; then
-        # Register heat image for Fake plugin
-        local fake_plugin_properties="--property _sahara_tag_0.1=True"
-        fake_plugin_properties+=" --property _sahara_tag_fake=True"
-        fake_plugin_properties+=" --property _sahara_username=fedora"
-        openstack --os-url $GLANCE_SERVICE_PROTOCOL://$GLANCE_HOSTPORT image set $(basename "$HEAT_CFN_IMAGE_URL" ".qcow2") $fake_plugin_properties
-    fi
-}
-
 # start_sahara() - Start running processes, including screen
 function start_sahara {
     local service_port=$SAHARA_SERVICE_PORT
@@ -228,7 +216,6 @@ if is_service_enabled sahara; then
         create_sahara_accounts
     elif [[ "$1" == "stack" && "$2" == "extra" ]]; then
         echo_summary "Initializing sahara"
-        sahara_register_images
         start_sahara
     fi