openstack/devstack
Code Issues Proposed changes

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

Browse Source
This commit is contained in:
Jenkins 2015-01-20 18:36:08 +00:00 committed by Gerrit Code Review
commit 222ff80869
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
extras.d/70-sahara.sh
View File

@ -15,6 +15,7 @@ if is_service_enabled sahara; then
create_sahara_accounts create_sahara_accounts
elif [[ "$1" == "stack" && "$2" == "extra" ]]; then elif [[ "$1" == "stack" && "$2" == "extra" ]]; then
echo_summary "Initializing sahara" echo_summary "Initializing sahara"
sahara_register_images
start_sahara start_sahara
fi fi

12
lib/sahara
View File

@ -11,6 +11,7 @@
# install_sahara # install_sahara
# install_python_saharaclient # install_python_saharaclient
# configure_sahara # configure_sahara
# sahara_register_images
# start_sahara # start_sahara
# stop_sahara # stop_sahara
# cleanup_sahara # cleanup_sahara
@ -164,6 +165,17 @@ function install_python_saharaclient {
fi 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 # start_sahara() - Start running processes, including screen
function start_sahara { function start_sahara {
run_process sahara "$SAHARA_BIN_DIR/sahara-all --config-file $SAHARA_CONF_FILE" run_process sahara "$SAHARA_BIN_DIR/sahara-all --config-file $SAHARA_CONF_FILE"