From f1a65991873b890a195d1531946c58fa3e7c59be Mon Sep 17 00:00:00 2001 From: Sridhar Ramaswamy Date: Thu, 1 Dec 2016 15:52:32 -0800 Subject: [PATCH] Remove keystone catalog backend KEYSTONE_CATALOG_BACKEND is deprecated and removed post Newton [1]. This needs to be removed in Tacker as well to avoid gate failure. [1] https://review.openstack.org/#/c/278333 Co-Authored-By: Tung Doan Change-Id: I021e4a4ef0240f85e6cce7feda431d6695f4482b --- devstack/lib/tacker | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/devstack/lib/tacker b/devstack/lib/tacker index f836e03d2..5a443ab5f 100644 --- a/devstack/lib/tacker +++ b/devstack/lib/tacker @@ -118,15 +118,13 @@ function create_tacker_accounts { get_or_create_role "advsvc" create_service_user "tacker" "advsvc" - if [[ "$KEYSTONE_CATALOG_BACKEND" = 'sql' ]]; then - local tacker_service=$(get_or_create_service "tacker" \ - "nfv-orchestration" "Tacker NFV Orchestration Service") - get_or_create_endpoint $tacker_service \ - "$REGION_NAME" \ - "$TACKER_PROTOCOL://$SERVICE_HOST:$TACKER_PORT/" \ - "$TACKER_PROTOCOL://$SERVICE_HOST:$TACKER_PORT/" \ - "$TACKER_PROTOCOL://$SERVICE_HOST:$TACKER_PORT/" - fi + local tacker_service=$(get_or_create_service "tacker" \ + "nfv-orchestration" "Tacker NFV Orchestration Service") + get_or_create_endpoint $tacker_service \ + "$REGION_NAME" \ + "$TACKER_PROTOCOL://$SERVICE_HOST:$TACKER_PORT/" \ + "$TACKER_PROTOCOL://$SERVICE_HOST:$TACKER_PORT/" \ + "$TACKER_PROTOCOL://$SERVICE_HOST:$TACKER_PORT/" fi }