move nova-manage commands below the conf generation
diff --git a/stack.sh b/stack.sh
index ca1f7fa..0ddf4db 100755
--- a/stack.sh
+++ b/stack.sh
@@ -321,19 +321,6 @@
mkdir -p $NOVA_DIR/networks
fi
-if [[ "$ENABLED_SERVICES" =~ "mysql" ]]; then
- # (re)create nova database
- mysql -u$MYSQL_USER -p$MYSQL_PASS -e 'DROP DATABASE nova;' || true
- mysql -u$MYSQL_USER -p$MYSQL_PASS -e 'CREATE DATABASE nova;'
- $NOVA_DIR/bin/nova-manage db sync
-
- # create a small network
- $NOVA_DIR/bin/nova-manage network create private $FIXED_RANGE 1 32
-
- # create some floating ips
- $NOVA_DIR/bin/nova-manage floating create $FLOATING_RANGE
-fi
-
function add_nova_flag {
echo "$1" >> $NOVA_DIR/bin/nova.conf
}
@@ -364,6 +351,20 @@
add_nova_flag "--multi_host=$MULTI_HOST"
fi
+if [[ "$ENABLED_SERVICES" =~ "mysql" ]]; then
+ # (re)create nova database
+ mysql -u$MYSQL_USER -p$MYSQL_PASS -e 'DROP DATABASE nova;' || true
+ mysql -u$MYSQL_USER -p$MYSQL_PASS -e 'CREATE DATABASE nova;'
+ $NOVA_DIR/bin/nova-manage db sync
+
+ # create a small network
+ $NOVA_DIR/bin/nova-manage network create private $FIXED_RANGE 1 32
+
+ # create some floating ips
+ $NOVA_DIR/bin/nova-manage floating create $FLOATING_RANGE
+fi
+
+
# Keystone
# --------