openstack/devstack
Code Issues Proposed changes

Merge "If heat is enabled, replace nova flavors."

Browse Source
This commit is contained in:
Jenkins 2012-10-29 16:25:34 +00:00 committed by Gerrit Code Review
commit 9d10103888
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/heat
View File

@ -189,6 +189,7 @@ function init_heat() {
mysql -u$MYSQL_USER -p$MYSQL_PASSWORD -e 'CREATE DATABASE heat CHARACTER SET utf8;' mysql -u$MYSQL_USER -p$MYSQL_PASSWORD -e 'CREATE DATABASE heat CHARACTER SET utf8;'
$HEAT_DIR/bin/heat-db-setup $os_PACKAGE -r $MYSQL_PASSWORD $HEAT_DIR/bin/heat-db-setup $os_PACKAGE -r $MYSQL_PASSWORD
$HEAT_DIR/tools/nova_create_flavors.sh
} }
# install_heat() - Collect source and prepare # install_heat() - Collect source and prepare

20
stack.sh
View File

@ -1897,15 +1897,6 @@ else
fi fi
# Heat
# ----
if is_service_enabled heat; then
echo_summary "Configuring Heat"
init_heat
fi
# Launch Services # Launch Services
# =============== # ===============
@ -2025,8 +2016,12 @@ screen_it swift "cd $SWIFT_DIR && $SWIFT_DIR/bin/swift-proxy-server ${SWIFT_CONF
is_service_enabled swift3 || \ is_service_enabled swift3 || \
screen_it n-obj "cd $NOVA_DIR && $NOVA_BIN_DIR/nova-objectstore" screen_it n-obj "cd $NOVA_DIR && $NOVA_BIN_DIR/nova-objectstore"
# launch heat engine, api and metadata
# Configure and launch heat engine, api and metadata
if is_service_enabled heat; then if is_service_enabled heat; then
# Initialize heat, including replacing nova flavors
echo_summary "Configuring Heat"
init_heat
echo_summary "Starting Heat" echo_summary "Starting Heat"
start_heat start_heat
fi fi
@ -2098,6 +2093,11 @@ if is_service_enabled horizon; then
echo "Horizon is now available at http://$SERVICE_HOST/" echo "Horizon is now available at http://$SERVICE_HOST/"
fi fi
# Warn that the default flavors have been changed by Heat
if is_service_enabled heat; then
echo "Heat has replaced the default flavors. View by running: nova flavor-list"
fi
# If Keystone is present you can point ``nova`` cli to this server # If Keystone is present you can point ``nova`` cli to this server
if is_service_enabled key; then if is_service_enabled key; then
echo "Keystone is serving at $KEYSTONE_AUTH_PROTOCOL://$SERVICE_HOST:$KEYSTONE_API_PORT/v2.0/" echo "Keystone is serving at $KEYSTONE_AUTH_PROTOCOL://$SERVICE_HOST:$KEYSTONE_API_PORT/v2.0/"