openstack/masakari
Code Issues Proposed changes

[Devstack] Fix devstack plugin compatibility

Browse Source 
Recent devstack commit [1] broke masakari devstack plugin compatibility.
So, fix it by removing dependency on deleted env var in the same way
as it is done in devstack [2].

[1] I7c66e1d8d65f562596543ed8ca402dba8c8ea271
[2] I4e5c7e86aefe72fc21c77d423033e9b169318fec

Change-Id: Ibd4d8531fb9ac2cb3e9b0854bdd44011fc589070
Closes-Bug: #1644194
This commit is contained in:
Abhishek Kekane 2016-12-26 13:07:43 +05:30 committed by Takashi Kajinami
parent 1c2fc1bfb4
commit becd230133
1 changed files with 7 additions and 10 deletions

17
devstack/plugin.sh

@ -46,16 +46,13 @@ function create_masakari_accounts {
create_service_user "masakari" "admin"
if [[ "$KEYSTONE_CATALOG_BACKEND" = 'sql' ]]; then
local masakari_service=$(get_or_create_service "masakari" \
"ha" "OpenStack High Availability")
get_or_create_endpoint $masakari_service \
"$REGION_NAME" \
"http://$SERVICE_HOST:$MASAKARI_SERVICE_PORT/v1/\$(tenant_id)s" \
"http://$SERVICE_HOST:$MASAKARI_SERVICE_PORT/v1/\$(tenant_id)s" \
"http://$SERVICE_HOST:$MASAKARI_SERVICE_PORT/v1/\$(tenant_id)s"
fi
local masakari_service=$(get_or_create_service "masakari" \
"ha" "OpenStack High Availability")
get_or_create_endpoint $masakari_service \
"$REGION_NAME" \
"http://$SERVICE_HOST:$MASAKARI_SERVICE_PORT/v1/\$(tenant_id)s" \
"http://$SERVICE_HOST:$MASAKARI_SERVICE_PORT/v1/\$(tenant_id)s" \
"http://$SERVICE_HOST:$MASAKARI_SERVICE_PORT/v1/\$(tenant_id)s"
fi
}