Arnike/watcher
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove KEYSTONE_CATALOG_BACKEND from DevStack plugin"

Browse Source
This commit is contained in:
Jenkins
2016-02-16 08:24:54 +00:00
committed by Gerrit Code Review
parent 5baff7dc3e 259f2562e6
commit fe3f6e73be
1 changed files with 7 additions and 9 deletions
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