Merge "move horizon logic to lib to clean up stack.sh"
diff --git a/files/keystone_data.sh b/files/keystone_data.sh
index 71994a8..f75d24a 100755
--- a/files/keystone_data.sh
+++ b/files/keystone_data.sh
@@ -106,7 +106,7 @@
fi
# Nova
-if [[ "$ENABLED_SERVICES" =~ "n-cpu" ]]; then
+if [[ "$ENABLED_SERVICES" =~ "n-api" ]]; then
NOVA_USER=$(get_id keystone user-create \
--name=nova \
--pass="$SERVICE_PASSWORD" \
diff --git a/lib/nova b/lib/nova
index b5efce9..3ea2f2a 100644
--- a/lib/nova
+++ b/lib/nova
@@ -432,9 +432,9 @@
screen_it n-net "cd $NOVA_DIR && $NOVA_BIN_DIR/nova-network"
screen_it n-sch "cd $NOVA_DIR && $NOVA_BIN_DIR/nova-scheduler"
screen_it n-novnc "cd $NOVNC_DIR && ./utils/nova-novncproxy --config-file $NOVA_CONF --web ."
- screen_it n-xvnc "cd $NOVA_DIR && ./bin/nova-xvpvncproxy --config-file $NOVA_CONF"
- screen_it n-cauth "cd $NOVA_DIR && ./bin/nova-consoleauth"
- screen_it n-cond "cd $NOVA_DIR && ./bin/nova-conductor"
+ screen_it n-xvnc "cd $NOVA_DIR && $NOVA_BIN_DIR/nova-xvpvncproxy --config-file $NOVA_CONF"
+ screen_it n-cauth "cd $NOVA_DIR && $NOVA_BIN_DIR/nova-consoleauth"
+ screen_it n-cond "cd $NOVA_DIR && $NOVA_BIN_DIR/nova-conductor"
}
# stop_nova() - Stop running processes (non-screen)