Browse code

use --silent-upload for glance - bug 945454

Change-Id: Ib96b38223e21644e3bfbbb3836eb24cbd5d33b49

Jesse Andrews authored on 2012/03/03 17:51:46
Showing 1 changed files
... ...
@@ -1573,9 +1573,9 @@ if is_service_enabled g-reg; then
1573 1573
         fi
1574 1574
 
1575 1575
         tar -zxf $FILES/tty.tgz -C $FILES/images
1576
-        RVAL=`glance add -A $TOKEN name="tty-kernel" is_public=true container_format=aki disk_format=aki < $FILES/images/aki-tty/image`
1576
+        RVAL=`glance add --silent-upload -A $TOKEN name="tty-kernel" is_public=true container_format=aki disk_format=aki < $FILES/images/aki-tty/image`
1577 1577
         KERNEL_ID=`echo $RVAL | cut -d":" -f2 | tr -d " "`
1578
-        RVAL=`glance add -A $TOKEN name="tty-ramdisk" is_public=true container_format=ari disk_format=ari < $FILES/images/ari-tty/image`
1578
+        RVAL=`glance add --silent-upload -A $TOKEN name="tty-ramdisk" is_public=true container_format=ari disk_format=ari < $FILES/images/ari-tty/image`
1579 1579
         RAMDISK_ID=`echo $RVAL | cut -d":" -f2 | tr -d " "`
1580 1580
         glance add -A $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
1581 1581
     fi
... ...
@@ -1624,11 +1624,11 @@ if is_service_enabled g-reg; then
1624 1624
         # kernel for use when uploading the root filesystem.
1625 1625
         KERNEL_ID=""; RAMDISK_ID="";
1626 1626
         if [ -n "$KERNEL" ]; then
1627
-            RVAL=`glance add -A $TOKEN name="$IMAGE_NAME-kernel" is_public=true container_format=aki disk_format=aki < "$KERNEL"`
1627
+            RVAL=`glance add --silent-upload -A $TOKEN name="$IMAGE_NAME-kernel" is_public=true container_format=aki disk_format=aki < "$KERNEL"`
1628 1628
             KERNEL_ID=`echo $RVAL | cut -d":" -f2 | tr -d " "`
1629 1629
         fi
1630 1630
         if [ -n "$RAMDISK" ]; then
1631
-            RVAL=`glance add -A $TOKEN name="$IMAGE_NAME-ramdisk" is_public=true container_format=ari disk_format=ari < "$RAMDISK"`
1631
+            RVAL=`glance add --silent-upload -A $TOKEN name="$IMAGE_NAME-ramdisk" is_public=true container_format=ari disk_format=ari < "$RAMDISK"`
1632 1632
             RAMDISK_ID=`echo $RVAL | cut -d":" -f2 | tr -d " "`
1633 1633
         fi
1634 1634
         glance add -A $TOKEN name="${IMAGE_NAME%.img}" is_public=true container_format=ami disk_format=ami ${KERNEL_ID:+kernel_id=$KERNEL_ID} ${RAMDISK_ID:+ramdisk_id=$RAMDISK_ID} < <(zcat --force "${IMAGE}")