openstack/deb-sahara
Code Issues Proposed changes

Merge "Remove never executable code from devstack plugin"

Browse Source
This commit is contained in:
Jenkins 2015-08-28 23:13:39 +00:00 committed by Gerrit Code Review
commit 4d09e31385
1 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
devstack/plugin.sh
View File

@ -11,7 +11,6 @@
# 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
@ -177,17 +176,6 @@ 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 {
local service_port=$SAHARA_SERVICE_PORT local service_port=$SAHARA_SERVICE_PORT
@ -233,7 +221,6 @@ 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