openstack/devstack
Code Issues Proposed changes

Merge "Fix Issues in Marconi integration"

Browse Source
This commit is contained in:
Jenkins 2013-12-17 15:31:33 +00:00 committed by Gerrit Code Review
commit 19bff77d20
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
exercises/marconi.sh
View File

@ -35,7 +35,7 @@ source $TOP_DIR/exerciserc
is_service_enabled marconi-server || exit 55 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 set +o xtrace
echo "*********************************************************************" echo "*********************************************************************"

5
lib/marconi
View File

@ -148,10 +148,11 @@ function create_marconi_accounts() {
--user-id $MARCONI_USER \ --user-id $MARCONI_USER \
--role-id $ADMIN_ROLE --role-id $ADMIN_ROLE
if [[ "$KEYSTONE_CATALOG_BACKEND" = 'sql' ]]; then if [[ "$KEYSTONE_CATALOG_BACKEND" = 'sql' ]]; then
MARCONI_SERVICE=$(get_id keystone service-create \ MARCONI_SERVICE=$(keystone service-create \
--name=marconi \ --name=marconi \
--type=queuing \ --type=queuing \
--description="Marconi Service") --description="Marconi Service" \
| grep " id " | get_field 2)
keystone endpoint-create \ keystone endpoint-create \
--region RegionOne \ --region RegionOne \
--service_id $MARCONI_SERVICE \ --service_id $MARCONI_SERVICE \