summaryrefslogtreecommitdiff
path: root/devstack
diff options
context:
space:
mode:
authorhimani <himani.relan@nectechnologies.in>2016-11-23 11:54:05 +0530
committerhimani <himani.relan@nectechnologies.in>2016-11-23 11:54:21 +0530
commitf52220939b3c47b95639fe4a7aea90815a0e3978 (patch)
tree1e31f7b1ae5a2e63cdc9e33335e540220373ef9e /devstack
parent39ec28436e577c6b245b9d3bf7ef8cc52afb88a9 (diff)
downloadtrove-f52220939b3c47b95639fe4a7aea90815a0e3978.tar.gz
Removed check for KEYSTONE_CATALOG_BACKEND from trove plugin
Devstack has removed KEYSTONE_CATALOG_BACKEND from it's repo: https://review.openstack.org/#/c/391380 Due to above change gate tests are failing, we should remove it from trove plugin as well. Refer below for it's deprecation and removal:- http://lists.openstack.org/pipermail/openstack-dev/2016-February/086272.html Closes-Bug: #1644085 Change-Id: I1c2024f629375a03bcb40fb9ee98c853ed52d53b
Diffstat (limited to 'devstack')
-rw-r--r--devstack/plugin.sh17
1 files changed, 7 insertions, 10 deletions
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index a79a0711..b4fb4f4b 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -54,16 +54,13 @@ function create_trove_accounts {
create_service_user "trove"
- if [[ "$KEYSTONE_CATALOG_BACKEND" = 'sql' ]]; then
-
- local trove_service=$(get_or_create_service "trove" \
- "database" "Trove Service")
- get_or_create_endpoint $trove_service \
- "$REGION_NAME" \
- "http://$SERVICE_HOST:8779/v1.0/\$(tenant_id)s" \
- "http://$SERVICE_HOST:8779/v1.0/\$(tenant_id)s" \
- "http://$SERVICE_HOST:8779/v1.0/\$(tenant_id)s"
- fi
+ local trove_service=$(get_or_create_service "trove" \
+ "database" "Trove Service")
+ get_or_create_endpoint $trove_service \
+ "$REGION_NAME" \
+ "http://$SERVICE_HOST:8779/v1.0/\$(tenant_id)s" \
+ "http://$SERVICE_HOST:8779/v1.0/\$(tenant_id)s" \
+ "http://$SERVICE_HOST:8779/v1.0/\$(tenant_id)s"
fi
}