The --public flag is deprecated. Let's not use it.
Change-Id: Ic6785ec2d1d5d3f7ab7cf2f584010ac38e339e0a
| ... | ... |
@@ -2255,19 +2255,19 @@ if is_service_enabled g-reg; then |
| 2255 | 2255 |
esac |
| 2256 | 2256 |
|
| 2257 | 2257 |
if [ "$CONTAINER_FORMAT" = "bare" ]; then |
| 2258 |
- glance --os-auth-token $TOKEN --os-image-url http://$GLANCE_HOSTPORT image-create --name "$IMAGE_NAME" --public --container-format=$CONTAINER_FORMAT --disk-format $DISK_FORMAT < <(zcat --force "${IMAGE}")
|
|
| 2258 |
+ glance --os-auth-token $TOKEN --os-image-url http://$GLANCE_HOSTPORT image-create --name "$IMAGE_NAME" --is-public=True --container-format=$CONTAINER_FORMAT --disk-format $DISK_FORMAT < <(zcat --force "${IMAGE}")
|
|
| 2259 | 2259 |
else |
| 2260 | 2260 |
# Use glance client to add the kernel the root filesystem. |
| 2261 | 2261 |
# We parse the results of the first upload to get the glance ID of the |
| 2262 | 2262 |
# kernel for use when uploading the root filesystem. |
| 2263 | 2263 |
KERNEL_ID=""; RAMDISK_ID=""; |
| 2264 | 2264 |
if [ -n "$KERNEL" ]; then |
| 2265 |
- KERNEL_ID=$(glance --os-auth-token $TOKEN --os-image-url http://$GLANCE_HOSTPORT image-create --name "$IMAGE_NAME-kernel" --public --container-format aki --disk-format aki < "$KERNEL" | grep ' id ' | get_field 2) |
|
| 2265 |
+ KERNEL_ID=$(glance --os-auth-token $TOKEN --os-image-url http://$GLANCE_HOSTPORT image-create --name "$IMAGE_NAME-kernel" --is-public=True --container-format aki --disk-format aki < "$KERNEL" | grep ' id ' | get_field 2) |
|
| 2266 | 2266 |
fi |
| 2267 | 2267 |
if [ -n "$RAMDISK" ]; then |
| 2268 |
- RAMDISK_ID=$(glance --os-auth-token $TOKEN --os-image-url http://$GLANCE_HOSTPORT image-create --name "$IMAGE_NAME-ramdisk" --public --container-format ari --disk-format ari < "$RAMDISK" | grep ' id ' | get_field 2) |
|
| 2268 |
+ RAMDISK_ID=$(glance --os-auth-token $TOKEN --os-image-url http://$GLANCE_HOSTPORT image-create --name "$IMAGE_NAME-ramdisk" --is-public=True --container-format ari --disk-format ari < "$RAMDISK" | grep ' id ' | get_field 2) |
|
| 2269 | 2269 |
fi |
| 2270 |
- glance --os-auth-token $TOKEN --os-image-url http://$GLANCE_HOSTPORT image-create --name "${IMAGE_NAME%.img}" --public --container-format ami --disk-format ami ${KERNEL_ID:+--property kernel_id=$KERNEL_ID} ${RAMDISK_ID:+--property ramdisk_id=$RAMDISK_ID} < "${IMAGE}"
|
|
| 2270 |
+ glance --os-auth-token $TOKEN --os-image-url http://$GLANCE_HOSTPORT image-create --name "${IMAGE_NAME%.img}" --is-public=True --container-format ami --disk-format ami ${KERNEL_ID:+--property kernel_id=$KERNEL_ID} ${RAMDISK_ID:+--property ramdisk_id=$RAMDISK_ID} < "${IMAGE}"
|
|
| 2271 | 2271 |
fi |
| 2272 | 2272 |
done |
| 2273 | 2273 |
fi |