Skip to content
Browse files

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
  • Loading branch information...
1 parent 7f28584 commit 0f7ad6bba6fe451c69cdc27fadfbb8ed8fdc7b71 @malini-kamalambal malini-kamalambal committed
Showing with 4 additions and 3 deletions.
  1. +1 −1 exercises/marconi.sh
  2. +3 −2 lib/marconi
View
2 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 "*********************************************************************"
View
5 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 \

0 comments on commit 0f7ad6b

Please sign in to comment.
Something went wrong with that request. Please try again.