Merge "Don't enable osapi_volume if n-vol not enabled."
diff --git a/lib/heat b/lib/heat
index 80e3f7a..7fb5fcc 100644
--- a/lib/heat
+++ b/lib/heat
@@ -189,6 +189,7 @@
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/tools/nova_create_flavors.sh
}
# install_heat() - Collect source and prepare
diff --git a/lib/keystone b/lib/keystone
index 06920f8..73d82c5 100644
--- a/lib/keystone
+++ b/lib/keystone
@@ -47,6 +47,7 @@
KEYSTONE_SERVICE_HOST=${KEYSTONE_SERVICE_HOST:-$SERVICE_HOST}
KEYSTONE_SERVICE_PORT=${KEYSTONE_SERVICE_PORT:-5000}
KEYSTONE_SERVICE_PROTOCOL=${KEYSTONE_SERVICE_PROTOCOL:-http}
+KEYSTONE_TOKEN_FORMAT=${KEYSTONE_TOKEN_FORMAT:-PKI}
# Entry Points
@@ -82,6 +83,7 @@
# Rewrite stock ``keystone.conf``
iniset $KEYSTONE_CONF DEFAULT admin_token "$SERVICE_TOKEN"
+ iniset $KEYSTONE_CONF signing token_format "$KEYSTONE_TOKEN_FORMAT"
iniset $KEYSTONE_CONF sql connection "$BASE_SQL_CONN/keystone?charset=utf8"
iniset $KEYSTONE_CONF ec2 driver "keystone.contrib.ec2.backends.sql.Ec2"
sed -e "
diff --git a/stack.sh b/stack.sh
index d101798..29e4953 100755
--- a/stack.sh
+++ b/stack.sh
@@ -338,7 +338,7 @@
Q_AUTH_STRATEGY=${Q_AUTH_STRATEGY:-keystone}
# Use namespace or not
Q_USE_NAMESPACE=${Q_USE_NAMESPACE:-True}
-Q_USE_ROOTWRAP=${Q_USE_ROOTWRAP=:-True}
+Q_USE_ROOTWRAP=${Q_USE_ROOTWRAP:-True}
# Meta data IP
Q_META_DATA_IP=${Q_META_DATA_IP:-$HOST_IP}
@@ -1897,15 +1897,6 @@
fi
-# Heat
-# ----
-
-if is_service_enabled heat; then
- echo_summary "Configuring Heat"
- init_heat
-fi
-
-
# Launch Services
# ===============
@@ -2025,8 +2016,12 @@
is_service_enabled swift3 || \
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
+ # Initialize heat, including replacing nova flavors
+ echo_summary "Configuring Heat"
+ init_heat
echo_summary "Starting Heat"
start_heat
fi
@@ -2098,6 +2093,11 @@
echo "Horizon is now available at http://$SERVICE_HOST/"
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 is_service_enabled key; then
echo "Keystone is serving at $KEYSTONE_AUTH_PROTOCOL://$SERVICE_HOST:$KEYSTONE_API_PORT/v2.0/"