Fix missing --container-format options

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

Closes-bug: 1357602
Change-Id: I1f4482f218b51ce7d7617cbd5771790c8dcb631a

Author: Dean Troyer

lib/baremetal

@@ -235,13 +235,15 @@ function upload_baremetal_deploy {
         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 \
         --os-url http://$GLANCE_HOSTPORT \
         image create \
         $BM_DEPLOY_RAMDISK \
         --public --disk-format=ari \
+        --container-format=ari \
         < $TOP_DIR/files/$BM_DEPLOY_RAMDISK  | grep ' id ' | get_field 2)
 }
 
@@ -290,13 +292,15 @@ function extract_and_upload_k_and_r_from_image {
         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 \
         --os-url http://$GLANCE_HOSTPORT \
         image create \
         $image_name-initrd \
         --public --disk-format=ari \
+        --container-format=ari \
         < $TOP_DIR/files/$OUT_RAMDISK | grep ' id ' | get_field 2)
 }