|
...
|
...
|
@@ -427,7 +427,7 @@ if [[ "$ENABLED_SERVICES" =~ "g-api" ]]; then
|
|
427
|
427
|
fi
|
|
428
|
428
|
|
|
429
|
429
|
if [[ "$ENABLED_SERVICES" =~ "key" ]]; then
|
|
430
|
|
- screen_it key "$KEYSTONE_DIR/bin/keystone --config-file $KEYSTONE_CONF"
|
|
|
430
|
+ screen_it key "cd $KEYSTONE_DIR && $KEYSTONE_DIR/bin/keystone --config-file $KEYSTONE_CONF"
|
|
431
|
431
|
while ! wget -q -O- http://127.0.0.1:5000; do
|
|
432
|
432
|
echo "Waiting for keystone to start..."
|
|
433
|
433
|
sleep 1
|
|
...
|
...
|
@@ -435,7 +435,7 @@ if [[ "$ENABLED_SERVICES" =~ "key" ]]; then
|
|
435
|
435
|
fi
|
|
436
|
436
|
|
|
437
|
437
|
if [[ "$ENABLED_SERVICES" =~ "n-api" ]]; then
|
|
438
|
|
- screen_it n-api "$NOVA_DIR/bin/nova-api"
|
|
|
438
|
+ screen_it n-api "cd $NOVA_DIR && $NOVA_DIR/bin/nova-api"
|
|
439
|
439
|
while ! wget -q -O- http://127.0.0.1:8774; do
|
|
440
|
440
|
echo "Waiting for nova-api to start..."
|
|
441
|
441
|
sleep 1
|
|
...
|
...
|
@@ -447,12 +447,12 @@ fi
|
|
447
|
447
|
# within the context of our original shell (so our groups won't be updated).
|
|
448
|
448
|
# We can send the command nova-compute to the ``newgrp`` command to execute
|
|
449
|
449
|
# in a specific context.
|
|
450
|
|
-screen_it n-cpu "echo $NOVA_DIR/bin/nova-compute | newgrp libvirtd"
|
|
451
|
|
-screen_it n-net "$NOVA_DIR/bin/nova-network"
|
|
452
|
|
-screen_it n-sch "$NOVA_DIR/bin/nova-scheduler"
|
|
|
450
|
+screen_it n-cpu "cd $NOVA_DIR && echo $NOVA_DIR/bin/nova-compute | newgrp libvirtd"
|
|
|
451
|
+screen_it n-net "cd $NOVA_DIR && $NOVA_DIR/bin/nova-network"
|
|
|
452
|
+screen_it n-sch "cd $NOVA_DIR && $NOVA_DIR/bin/nova-scheduler"
|
|
453
|
453
|
# nova-vncproxy binds a privileged port, and so needs sudo
|
|
454
|
|
-screen_it n-vnc "sudo $NOVA_DIR/bin/nova-vncproxy"
|
|
455
|
|
-screen_it dash "sudo /etc/init.d/apache2 restart; sudo tail -f /var/log/apache2/error.log"
|
|
|
454
|
+screen_it n-vnc "cd $NOVA_DIR && sudo $NOVA_DIR/bin/nova-vncproxy"
|
|
|
455
|
+screen_it dash "cd $DASH_DIR && sudo /etc/init.d/apache2 restart; sudo tail -f /var/log/apache2/error.log"
|
|
456
|
456
|
|
|
457
|
457
|
# Install Images
|
|
458
|
458
|
# ==============
|