openstack/watcher
Code Issues Proposed changes

Remove KEYSTONE_CATALOG_BACKEND from DevStack plugin

Browse Source 
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
This commit is contained in:
Darren Shaw 2016-02-12 09:50:24 -06:00
parent 1629247413
commit 259f2562e6
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
devstack/lib/watcher
View File

@ -96,15 +96,13 @@ function configure_watcher {
function create_watcher_accounts { function create_watcher_accounts {
create_service_user "watcher" "admin" create_service_user "watcher" "admin"
if [[ "$KEYSTONE_CATALOG_BACKEND" = 'sql' ]]; then local watcher_service=$(get_or_create_service "watcher" \
local watcher_service=$(get_or_create_service "watcher" \ "infra-optim" "Watcher Infrastructure Optimization Service")
"infra-optim" "Watcher Infrastructure Optimization Service") get_or_create_endpoint $watcher_service \
get_or_create_endpoint $watcher_service \ "$REGION_NAME" \
"$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" \
"$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
} }
# create_watcher_conf() - Create a new watcher.conf file # create_watcher_conf() - Create a new watcher.conf file