commit 010269341e0adf87dd96af9bb8b1cda4d8183ba4
author Dean Troyer <dtroyer@gmail.com> Fri Aug 15 15:53:03 2014 -0500
committer Ian Wienand <iwienand@redhat.com> Mon Aug 18 01:29:35 2014 +0000
tree 98688b71d0876f1641647ff501e966edc87e3a01
parent 735f4d340f5772bac29c1aa23fdfb5e2df500ca3

Fix missing --container-format options

Cooresponding fix to https://review.openstack.org/114619 for lib/baremetal.

Closes-bug: 1357602
Change-Id: I1f4482f218b51ce7d7617cbd5771790c8dcb631a

lib/baremetal

diff --git a/lib/baremetal b/lib/baremetal
index e3b2b9a..4ef161a 100644
--- a/lib/baremetal
+++ b/lib/baremetal
@@ -235,6 +235,7 @@
         image create \
         $BM_DEPLOY_KERNEL \
         --public --disk-format=aki \
+        --container-format=aki \
         < $TOP_DIR/files/$BM_DEPLOY_KERNEL  | grep ' id ' | get_field 2)
     BM_DEPLOY_RAMDISK_ID=$(openstack \
         --os-token $token \
@@ -242,6 +243,7 @@
         image create \
         $BM_DEPLOY_RAMDISK \
         --public --disk-format=ari \
+        --container-format=ari \
         < $TOP_DIR/files/$BM_DEPLOY_RAMDISK  | grep ' id ' | get_field 2)
 }
 
@@ -290,6 +292,7 @@
         image create \
         $image_name-kernel \
         --public --disk-format=aki \
+        --container-format=aki \
         < $TOP_DIR/files/$OUT_KERNEL | grep ' id ' | get_field 2)
     RAMDISK_ID=$(openstack \
         --os-token $token \
@@ -297,6 +300,7 @@
         image create \
         $image_name-initrd \
         --public --disk-format=ari \
+        --container-format=ari \
         < $TOP_DIR/files/$OUT_RAMDISK | grep ' id ' | get_field 2)
 }