commit f9ae6aed617d2dfcfc25f9ffb6da48790772f329
author Jenkins <jenkins@review.openstack.org> Sat Aug 23 09:59:33 2014 +0000
committer Gerrit Code Review <review@openstack.org> Sat Aug 23 09:59:33 2014 +0000
tree 7ac48fb28f46035607e4fffdb3c681df6ff318cf
parent 47290ee1b290e38bdb093a46b4ec25d9d8b2e47a
parent 010269341e0adf87dd96af9bb8b1cda4d8183ba4

Merge "Fix missing --container-format options"

lib/baremetal

diff --git a/lib/baremetal b/lib/baremetal
index 79c499c..af90c06 100644
--- a/lib/baremetal
+++ b/lib/baremetal
@@ -232,6 +232,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 \
@@ -239,6 +240,7 @@
         image create \
         $BM_DEPLOY_RAMDISK \
         --public --disk-format=ari \
+        --container-format=ari \
         < $TOP_DIR/files/$BM_DEPLOY_RAMDISK  | grep ' id ' | get_field 2)
 }
 
@@ -287,6 +289,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 \
@@ -294,6 +297,7 @@
         image create \
         $image_name-initrd \
         --public --disk-format=ari \
+        --container-format=ari \
         < $TOP_DIR/files/$OUT_RAMDISK | grep ' id ' | get_field 2)
 }