Browse code

fix grabbing kernel/ramdisk

Jesse Andrews authored on 2011/10/03 08:23:22
Showing 1 changed files
... ...
@@ -576,13 +576,9 @@ if [[ "$ENABLED_SERVICES" =~ "g-reg" ]]; then
576 576
     tar -zxf $FILES/tty.tgz -C $FILES/images
577 577
 
578 578
     # add a debugging images to glance
579
-    KERNEL_ID=glance add -A $SERVICE_TOKEN name="tty-kernel" is_public=true \
580
-        container_format=aki disk_format=aki < $FILES/images/aki-tty/image
581
-    RAMDISK_ID=glance add -A $SERVICE_TOKEN name="tty-ramdisk" is_public=true \
582
-        container_format=ari disk_format=ari < $FILES/images/ari-tty/image
583
-    glance add -A $SERVICE_TOKEN name="tty" is_public=true container_format=ami \
584
-        disk_format=ami kernel_id=$KERNEL_ID \
585
-        ramdisk_id=$RAMDISK_ID < $FILES/images/ami-tty/image
579
+    KERNEL_ID=`glance add -A $SERVICE_TOKEN name="tty-kernel" is_public=true container_format=aki disk_format=aki < $FILES/images/aki-tty/image`
580
+    RAMDISK_ID=`glance add -A $SERVICE_TOKEN name="tty-ramdisk" is_public=true container_format=ari disk_format=ari < $FILES/images/ari-tty/image`
581
+    glance add -A $SERVICE_TOKEN name="tty" is_public=true container_format=ami disk_format=ami kernel_id=$KERNEL_ID ramdisk_id=$RAMDISK_ID < $FILES/images/ami-tty/image
586 582
 fi
587 583
 
588 584
 # Using the cloud