Skip to content

Commit 7052f72

Browse files
committed
use --silent-upload for glance - bug 945454
Change-Id: Ib96b38223e21644e3bfbbb3836eb24cbd5d33b49
1 parent 489bd2a commit 7052f72

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

stack.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1573,9 +1573,9 @@ if is_service_enabled g-reg; then
15731573
fi
15741574

15751575
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`
15771577
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`
15791579
RAMDISK_ID=`echo $RVAL | cut -d":" -f2 | tr -d " "`
15801580
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
15811581
fi
@@ -1624,11 +1624,11 @@ if is_service_enabled g-reg; then
16241624
# kernel for use when uploading the root filesystem.
16251625
KERNEL_ID=""; RAMDISK_ID="";
16261626
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"`
16281628
KERNEL_ID=`echo $RVAL | cut -d":" -f2 | tr -d " "`
16291629
fi
16301630
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"`
16321632
RAMDISK_ID=`echo $RVAL | cut -d":" -f2 | tr -d " "`
16331633
fi
16341634
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}")

0 commit comments

Comments
 (0)