From 0b3aacc707ab8b3593285e02dc172b3c96730efc Mon Sep 17 00:00:00 2001
From: Malini Kamalambal <malini.kamalambal@rackspace.com>
Date: Thu, 13 Feb 2014 18:18:51 -0500
Subject: [PATCH] Fix MARCONI_USER

This patch fixes the MARCONI_USER in create_marconi_accounts().

Change-Id: I9618530fa20ee84d25646107c7450017ada908df
---
 lib/marconi | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/marconi b/lib/marconi
index 0aaff1bd58..e400419d57 100644
--- a/lib/marconi
+++ b/lib/marconi
@@ -154,10 +154,12 @@ function create_marconi_accounts() {
     MARCONI_USER=$(get_id keystone user-create --name=marconi \
                                                 --pass="$SERVICE_PASSWORD" \
                                                 --tenant-id $SERVICE_TENANT \
-                                                --email=marconi@example.com)
+                                                --email=marconi@example.com \
+                                                | grep " id " | get_field 2)
     keystone user-role-add --tenant-id $SERVICE_TENANT \
                             --user-id $MARCONI_USER \
                             --role-id $ADMIN_ROLE
+
     if [[ "$KEYSTONE_CATALOG_BACKEND" = 'sql' ]]; then
         MARCONI_SERVICE=$(keystone service-create \
             --name=marconi \