From 6066327474f9e4a9f3f6f3db11138f06c942ecb8 Mon Sep 17 00:00:00 2001
From: Davanum Srinivas <dims@linux.vnet.ibm.com>
Date: Tue, 8 Apr 2014 13:47:17 -0400
Subject: [PATCH] euca-bundle-image requires a new architecture parameter

Ran into this issue while trying to enable UCA. This switch was
documented by the euca2ools team in:
https://eucalyptus.atlassian.net/browse/DOC-807

Closes-Bug: #1304571

Change-Id: I1ea7c6a760c75e67f09e566d73e571be3a1d89ea
---
 lib/tempest | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/tempest b/lib/tempest
index 0b5f332672..f366ff87ec 100644
--- a/lib/tempest
+++ b/lib/tempest
@@ -416,9 +416,9 @@ function init_tempest {
         ( #new namespace
             # tenant:demo ; user: demo
             source $TOP_DIR/accrc/demo/demo
-            euca-bundle-image -i "$kernel" --kernel true -d "$BOTO_MATERIALS_PATH"
-            euca-bundle-image -i "$ramdisk" --ramdisk true -d "$BOTO_MATERIALS_PATH"
-            euca-bundle-image -i "$disk_image" -d "$BOTO_MATERIALS_PATH"
+            euca-bundle-image -r x86_64 -i "$kernel" --kernel true -d "$BOTO_MATERIALS_PATH"
+            euca-bundle-image -r x86_64 -i "$ramdisk" --ramdisk true -d "$BOTO_MATERIALS_PATH"
+            euca-bundle-image -r x86_64 -i "$disk_image" -d "$BOTO_MATERIALS_PATH"
         ) 2>&1 </dev/null | cat
     else
         echo "Boto materials are not prepared"