Browse code

Merge "Fix missing --container-format options"

Jenkins authored on 2014/08/23 18:59:33
Showing 1 changed files
... ...
@@ -232,6 +232,7 @@ function upload_baremetal_deploy {
232 232
         image create \
233 233
         $BM_DEPLOY_KERNEL \
234 234
         --public --disk-format=aki \
235
+        --container-format=aki \
235 236
         < $TOP_DIR/files/$BM_DEPLOY_KERNEL  | grep ' id ' | get_field 2)
236 237
     BM_DEPLOY_RAMDISK_ID=$(openstack \
237 238
         --os-token $token \
... ...
@@ -239,6 +240,7 @@ function upload_baremetal_deploy {
239 239
         image create \
240 240
         $BM_DEPLOY_RAMDISK \
241 241
         --public --disk-format=ari \
242
+        --container-format=ari \
242 243
         < $TOP_DIR/files/$BM_DEPLOY_RAMDISK  | grep ' id ' | get_field 2)
243 244
 }
244 245
 
... ...
@@ -287,6 +289,7 @@ function extract_and_upload_k_and_r_from_image {
287 287
         image create \
288 288
         $image_name-kernel \
289 289
         --public --disk-format=aki \
290
+        --container-format=aki \
290 291
         < $TOP_DIR/files/$OUT_KERNEL | grep ' id ' | get_field 2)
291 292
     RAMDISK_ID=$(openstack \
292 293
         --os-token $token \
... ...
@@ -294,6 +297,7 @@ function extract_and_upload_k_and_r_from_image {
294 294
         image create \
295 295
         $image_name-initrd \
296 296
         --public --disk-format=ari \
297
+        --container-format=ari \
297 298
         < $TOP_DIR/files/$OUT_RAMDISK | grep ' id ' | get_field 2)
298 299
 }
299 300