From 010269341e0adf87dd96af9bb8b1cda4d8183ba4 Mon Sep 17 00:00:00 2001
From: Dean Troyer <dtroyer@gmail.com>
Date: Fri, 15 Aug 2014 15:53:03 -0500
Subject: [PATCH] Fix missing --container-format options

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

Closes-bug: 1357602
Change-Id: I1f4482f218b51ce7d7617cbd5771790c8dcb631a
---
 lib/baremetal | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/baremetal b/lib/baremetal
index e3b2b9a46b..4ef161aa5b 100644
--- a/lib/baremetal
+++ b/lib/baremetal
@@ -235,6 +235,7 @@ 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 \
@@ -242,6 +243,7 @@ function upload_baremetal_deploy {
         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 @@ 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 \
@@ -297,6 +300,7 @@ function extract_and_upload_k_and_r_from_image {
         image create \
         $image_name-initrd \
         --public --disk-format=ari \
+        --container-format=ari \
         < $TOP_DIR/files/$OUT_RAMDISK | grep ' id ' | get_field 2)
 }