openstack
/
murano
Code Issues Proposed changes

Remove KEYSTONE_CATALOG_BACKEND variable usage 

- According upstream movement, we need to update our devstack
installation to avoid deployment failures.
- Patch in devstack: I4e5c7e86aefe72fc21c77d423033e9b169318fec

Change-Id: I6f30c6c5e768c4377fbc4da28688daca0404f927
Closes-Bug: #1545036
This commit is contained in:
Victor Ryzhenkin 2016-02-12 18:22:48 +03:00
parent e7296b8378
commit 86f5eefb5e
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
devstack/plugin.sh
View File

@ -31,22 +31,20 @@ function create_murano_accounts() {
create_service_user "murano"
if [[ "$KEYSTONE_CATALOG_BACKEND" = 'sql' ]]; then
get_or_create_service "murano" "application-catalog" "Application Catalog Service"
get_or_create_endpoint "application-catalog" \
"$REGION_NAME" \
"$MURANO_SERVICE_PROTOCOL://$MURANO_SERVICE_HOST:$MURANO_SERVICE_PORT" \
"$MURANO_SERVICE_PROTOCOL://$MURANO_SERVICE_HOST:$MURANO_SERVICE_PORT" \
"$MURANO_SERVICE_PROTOCOL://$MURANO_SERVICE_HOST:$MURANO_SERVICE_PORT"
get_or_create_service "murano" "application-catalog" "Application Catalog Service"
get_or_create_endpoint "application-catalog" \
"$REGION_NAME" \
"$MURANO_SERVICE_PROTOCOL://$MURANO_SERVICE_HOST:$MURANO_SERVICE_PORT" \
"$MURANO_SERVICE_PROTOCOL://$MURANO_SERVICE_HOST:$MURANO_SERVICE_PORT" \
"$MURANO_SERVICE_PROTOCOL://$MURANO_SERVICE_HOST:$MURANO_SERVICE_PORT"
if is_service_enabled murano-cfapi; then
get_or_create_service "murano-cfapi" "service-broker" "Murano CloudFoundry Service Broker"
get_or_create_endpoint "service-broker" \
"$REGION_NAME" \
"$MURANO_SERVICE_PROTOCOL://$MURANO_SERVICE_HOST:$MURANO_CFAPI_SERVICE_PORT" \
"$MURANO_SERVICE_PROTOCOL://$MURANO_SERVICE_HOST:$MURANO_CFAPI_SERVICE_PORT" \
"$MURANO_SERVICE_PROTOCOL://$MURANO_SERVICE_HOST:$MURANO_CFAPI_SERVICE_PORT"
fi
if is_service_enabled murano-cfapi; then
get_or_create_service "murano-cfapi" "service-broker" "Murano CloudFoundry Service Broker"
get_or_create_endpoint "service-broker" \
"$REGION_NAME" \
"$MURANO_SERVICE_PROTOCOL://$MURANO_SERVICE_HOST:$MURANO_CFAPI_SERVICE_PORT" \
"$MURANO_SERVICE_PROTOCOL://$MURANO_SERVICE_HOST:$MURANO_CFAPI_SERVICE_PORT" \
"$MURANO_SERVICE_PROTOCOL://$MURANO_SERVICE_HOST:$MURANO_CFAPI_SERVICE_PORT"
fi
}