summaryrefslogtreecommitdiff
path: root/devstack
diff options
context:
space:
mode:
authorLuigi Toscano <ltoscano@redhat.com>2018-05-21 10:33:10 +0200
committerLuigi Toscano <ltoscano@redhat.com>2018-05-21 10:33:10 +0200
commit6d1ef658c93c54e3e4aa9983c683befc26679118 (patch)
tree6127dd4e0563dcc11a8d1b0de176e6ba85b55de8 /devstack
parent1731d2364c576eb86285bbaab608a7c8b623c24a (diff)
Remove the usage of KEYSTONE_CATALOG_BACKEND
It was removed from DevStack before the Ocata release, see https://review.openstack.org/#/c/391380/ The support for the only alternative (templated catalog) was removed even earlier, before Mitaka: https://review.openstack.org/#/c/278333/ This means that the entry points for Swift can always be configured when RadosGW is enabled. Change-Id: I25c1f963665fab1dc77db40a2742dc29a9c1ee0b
Notes
Notes (review): Code-Review+2: S├ębastien Han <seb@redhat.com> Workflow+1: S├ębastien Han <seb@redhat.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Tue, 22 May 2018 00:06:37 +0000 Reviewed-on: https://review.openstack.org/569744 Project: openstack/devstack-plugin-ceph Branch: refs/heads/master
Diffstat (limited to 'devstack')
-rw-r--r--devstack/lib/ceph4
1 files changed, 1 insertions, 3 deletions
diff --git a/devstack/lib/ceph b/devstack/lib/ceph
index c183ae5..eeda6ff 100644
--- a/devstack/lib/ceph
+++ b/devstack/lib/ceph
@@ -609,9 +609,7 @@ function configure_ceph_embedded_rgw_paths {
609function configure_ceph_embedded_rgw { 609function configure_ceph_embedded_rgw {
610 configure_ceph_embedded_rgw_paths 610 configure_ceph_embedded_rgw_paths
611 # keystone endpoint for radosgw 611 # keystone endpoint for radosgw
612 if [[ "$KEYSTONE_CATALOG_BACKEND" = 'sql' ]]; then 612 _create_swift_endpoint
613 _create_swift_endpoint
614 fi
615 613
616 # Create radosgw service user with admin privileges 614 # Create radosgw service user with admin privileges
617 create_service_user "radosgw" "admin" 615 create_service_user "radosgw" "admin"