From 196ee5a7af3d7a33b9397e83178acad0f10f8c4c Mon Sep 17 00:00:00 2001 From: Sharat Sharma Date: Wed, 23 Nov 2016 18:28:23 +0530 Subject: [PATCH] Fix devstack plugin compatibility The devstack mistral compatibility was broken by a recent patch in devstack. This patch is intended to fix the issue by removing the dependency on deleted env variables. Change-Id: I768168fa95f5bc010815af5ff03117edb245137b Closes-Bug: #1644194 --- devstack/plugin.sh | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/devstack/plugin.sh b/devstack/plugin.sh index b01aa08cc..9d529f6d2 100755 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -33,14 +33,12 @@ function create_mistral_accounts { create_service_user "mistral" "admin" - if [[ "$KEYSTONE_CATALOG_BACKEND" = 'sql' ]]; then - get_or_create_service "mistral" "workflowv2" "Workflow Service v2" - get_or_create_endpoint "workflowv2" \ - "$REGION_NAME" \ - "$MISTRAL_SERVICE_PROTOCOL://$MISTRAL_SERVICE_HOST:$MISTRAL_SERVICE_PORT/v2" \ - "$MISTRAL_SERVICE_PROTOCOL://$MISTRAL_SERVICE_HOST:$MISTRAL_SERVICE_PORT/v2" \ - "$MISTRAL_SERVICE_PROTOCOL://$MISTRAL_SERVICE_HOST:$MISTRAL_SERVICE_PORT/v2" - fi + get_or_create_service "mistral" "workflowv2" "Workflow Service v2" + get_or_create_endpoint "workflowv2" \ + "$REGION_NAME" \ + "$MISTRAL_SERVICE_PROTOCOL://$MISTRAL_SERVICE_HOST:$MISTRAL_SERVICE_PORT/v2" \ + "$MISTRAL_SERVICE_PROTOCOL://$MISTRAL_SERVICE_HOST:$MISTRAL_SERVICE_PORT/v2" \ + "$MISTRAL_SERVICE_PROTOCOL://$MISTRAL_SERVICE_HOST:$MISTRAL_SERVICE_PORT/v2" }