From 0f7ad6bba6fe451c69cdc27fadfbb8ed8fdc7b71 Mon Sep 17 00:00:00 2001
From: Malini Kamalambal <malini.kamalambal@rackspace.com>
Date: Fri, 13 Dec 2013 12:42:31 -0500
Subject: [PATCH] Fix Issues in Marconi integration

This patch fixes a couple of issues, that prevents marconi from running
on devstack.

Change-Id: I47060a0334ad6f90f1402b34c83bb6ad22f723d4
Closes-Bug: #1260820
---
 exercises/marconi.sh | 2 +-
 lib/marconi          | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/exercises/marconi.sh b/exercises/marconi.sh
index 1b9788dce6..9d83a99f02 100755
--- a/exercises/marconi.sh
+++ b/exercises/marconi.sh
@@ -35,7 +35,7 @@ source $TOP_DIR/exerciserc
 
 is_service_enabled marconi-server || exit 55
 
-curl http://$SERVICE_HOST:8888/v1/ 2>/dev/null | grep -q 'Auth' || die $LINENO "Marconi API not functioning!"
+curl http://$SERVICE_HOST:8888/v1/ 2>/dev/null | grep -q 'queue_name' || die $LINENO "Marconi API not functioning!"
 
 set +o xtrace
 echo "*********************************************************************"
diff --git a/lib/marconi b/lib/marconi
index 8e0b82b49e..742f866e7d 100644
--- a/lib/marconi
+++ b/lib/marconi
@@ -148,10 +148,11 @@ function create_marconi_accounts() {
                             --user-id $MARCONI_USER \
                             --role-id $ADMIN_ROLE
     if [[ "$KEYSTONE_CATALOG_BACKEND" = 'sql' ]]; then
-        MARCONI_SERVICE=$(get_id keystone service-create \
+        MARCONI_SERVICE=$(keystone service-create \
             --name=marconi \
             --type=queuing \
-            --description="Marconi Service")
+            --description="Marconi Service" \
+            | grep " id " | get_field 2)
         keystone endpoint-create \
             --region RegionOne \
             --service_id $MARCONI_SERVICE \