...
|
...
|
@@ -518,10 +518,12 @@ function screen_it {
|
518
|
518
|
screen -d -m -S nova -t nova
|
519
|
519
|
sleep 1
|
520
|
520
|
|
|
521
|
+# launch the glance registery service
|
521
|
522
|
if [[ "$ENABLED_SERVICES" =~ "g-reg" ]]; then
|
522
|
523
|
screen_it g-reg "cd $GLANCE_DIR; bin/glance-registry --config-file=etc/glance-registry.conf"
|
523
|
524
|
fi
|
524
|
525
|
|
|
526
|
+# launch the glance api and wait for it to answer before continuing
|
525
|
527
|
if [[ "$ENABLED_SERVICES" =~ "g-api" ]]; then
|
526
|
528
|
screen_it g-api "cd $GLANCE_DIR; bin/glance-api --config-file=etc/glance-api.conf"
|
527
|
529
|
while ! wget -q -O- http://$GLANCE_HOSTPORT; do
|
...
|
...
|
@@ -530,6 +532,7 @@ if [[ "$ENABLED_SERVICES" =~ "g-api" ]]; then
|
530
|
530
|
done
|
531
|
531
|
fi
|
532
|
532
|
|
|
533
|
+# launch the keystone and wait for it to answer before continuing
|
533
|
534
|
if [[ "$ENABLED_SERVICES" =~ "key" ]]; then
|
534
|
535
|
screen_it key "cd $KEYSTONE_DIR && $KEYSTONE_DIR/bin/keystone --config-file $KEYSTONE_CONF -d"
|
535
|
536
|
while ! wget -q -O- http://127.0.0.1:5000; do
|
...
|
...
|
@@ -538,6 +541,7 @@ if [[ "$ENABLED_SERVICES" =~ "key" ]]; then
|
538
|
538
|
done
|
539
|
539
|
fi
|
540
|
540
|
|
|
541
|
+# launch the nova-api and wait for it to answer before continuing
|
541
|
542
|
if [[ "$ENABLED_SERVICES" =~ "n-api" ]]; then
|
542
|
543
|
screen_it n-api "cd $NOVA_DIR && $NOVA_DIR/bin/nova-api"
|
543
|
544
|
while ! wget -q -O- http://127.0.0.1:8774; do
|
...
|
...
|
@@ -571,11 +575,14 @@ if [[ "$ENABLED_SERVICES" =~ "g-reg" ]]; then
|
571
|
571
|
mkdir -p $FILES/images
|
572
|
572
|
tar -zxf $FILES/tty.tgz -C $FILES/images
|
573
|
573
|
|
574
|
|
- # add images to glance
|
575
|
|
- # FIXME: kernel/ramdisk is hardcoded - use return result from add
|
576
|
|
- glance add -A $SERVICE_TOKEN name="tty-kernel" is_public=true container_format=aki disk_format=aki < $FILES/images/aki-tty/image
|
577
|
|
- glance add -A $SERVICE_TOKEN name="tty-ramdisk" is_public=true container_format=ari disk_format=ari < $FILES/images/ari-tty/image
|
578
|
|
- glance add -A $SERVICE_TOKEN name="tty" is_public=true container_format=ami disk_format=ami kernel_id=1 ramdisk_id=2 < $FILES/images/ami-tty/image
|
|
574
|
+ # add a debugging images to glance
|
|
575
|
+ KERNEL_ID=glance add -A $SERVICE_TOKEN name="tty-kernel" is_public=true \
|
|
576
|
+ container_format=aki disk_format=aki < $FILES/images/aki-tty/image
|
|
577
|
+ RAMDISK_ID=glance add -A $SERVICE_TOKEN name="tty-ramdisk" is_public=true \
|
|
578
|
+ container_format=ari disk_format=ari < $FILES/images/ari-tty/image
|
|
579
|
+ glance add -A $SERVICE_TOKEN name="tty" is_public=true container_format=ami \
|
|
580
|
+ disk_format=ami kernel_id=$KERNEL_ID \
|
|
581
|
+ ramdisk_id=$RAMDISK_ID < $FILES/images/ami-tty/image
|
579
|
582
|
fi
|
580
|
583
|
|
581
|
584
|
# Using the cloud
|