From 259f2562e698cffcc3293d0e295f2f4dc3c58a18 Mon Sep 17 00:00:00 2001 From: Darren Shaw Date: Fri, 12 Feb 2016 09:50:24 -0600 Subject: [PATCH] Remove KEYSTONE_CATALOG_BACKEND from DevStack plugin Via Sean Dague in the mailing list: In Newton, the KEYSTONE_CATALOG_BACKEND variable will be removed. This commit removes the if check and variable from watcher Change-Id: I73c5dd25feff9ba9824c267a8817a49e4ad3a06a Closes-Bug: #1544433 --- devstack/lib/watcher | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/devstack/lib/watcher b/devstack/lib/watcher index afabcaacb..b2b3a14fe 100644 --- a/devstack/lib/watcher +++ b/devstack/lib/watcher @@ -96,15 +96,13 @@ function configure_watcher { function create_watcher_accounts { create_service_user "watcher" "admin" - if [[ "$KEYSTONE_CATALOG_BACKEND" = 'sql' ]]; then - local watcher_service=$(get_or_create_service "watcher" \ - "infra-optim" "Watcher Infrastructure Optimization Service") - get_or_create_endpoint $watcher_service \ - "$REGION_NAME" \ - "$WATCHER_SERVICE_PROTOCOL://$WATCHER_SERVICE_HOST:$WATCHER_SERVICE_PORT" \ - "$WATCHER_SERVICE_PROTOCOL://$WATCHER_SERVICE_HOST:$WATCHER_SERVICE_PORT" \ - "$WATCHER_SERVICE_PROTOCOL://$WATCHER_SERVICE_HOST:$WATCHER_SERVICE_PORT" - fi + local watcher_service=$(get_or_create_service "watcher" \ + "infra-optim" "Watcher Infrastructure Optimization Service") + get_or_create_endpoint $watcher_service \ + "$REGION_NAME" \ + "$WATCHER_SERVICE_PROTOCOL://$WATCHER_SERVICE_HOST:$WATCHER_SERVICE_PORT" \ + "$WATCHER_SERVICE_PROTOCOL://$WATCHER_SERVICE_HOST:$WATCHER_SERVICE_PORT" \ + "$WATCHER_SERVICE_PROTOCOL://$WATCHER_SERVICE_HOST:$WATCHER_SERVICE_PORT" } # create_watcher_conf() - Create a new watcher.conf file