Browse code

Merge "Register heat image in sahara image registry for fake plugin"

Jenkins authored on 2015/01/21 03:36:08
Showing 2 changed files
... ...
@@ -15,6 +15,7 @@ if is_service_enabled sahara; then
15 15
         create_sahara_accounts
16 16
     elif [[ "$1" == "stack" && "$2" == "extra" ]]; then
17 17
         echo_summary "Initializing sahara"
18
+        sahara_register_images
18 19
         start_sahara
19 20
     fi
20 21
 
... ...
@@ -11,6 +11,7 @@
11 11
 # install_sahara
12 12
 # install_python_saharaclient
13 13
 # configure_sahara
14
+# sahara_register_images
14 15
 # start_sahara
15 16
 # stop_sahara
16 17
 # cleanup_sahara
... ...
@@ -164,6 +165,17 @@ function install_python_saharaclient {
164 164
     fi
165 165
 }
166 166
 
167
+# sahara_register_images() - Registers images in sahara image registry
168
+function sahara_register_images {
169
+    if is_service_enabled heat && [[ ! -z "$HEAT_CFN_IMAGE_URL" ]]; then
170
+        # Register heat image for Fake plugin
171
+        local fake_plugin_properties="--property _sahara_tag_0.1=True"
172
+        fake_plugin_properties+=" --property _sahara_tag_fake=True"
173
+        fake_plugin_properties+=" --property _sahara_username=fedora"
174
+        openstack --os-url $GLANCE_SERVICE_PROTOCOL://$GLANCE_HOSTPORT image set $(basename "$HEAT_CFN_IMAGE_URL" ".qcow2") $fake_plugin_properties
175
+    fi
176
+}
177
+
167 178
 # start_sahara() - Start running processes, including screen
168 179
 function start_sahara {
169 180
     run_process sahara "$SAHARA_BIN_DIR/sahara-all --config-file $SAHARA_CONF_FILE"