From 6d1ef658c93c54e3e4aa9983c683befc26679118 Mon Sep 17 00:00:00 2001
From: Luigi Toscano <ltoscano@redhat.com>
Date: Mon, 21 May 2018 10:33:10 +0200
Subject: [PATCH] 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
---
 devstack/lib/ceph | 4 +---
 1 file changed, 1 insertion(+), 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 {
 function configure_ceph_embedded_rgw {
     configure_ceph_embedded_rgw_paths
     # keystone endpoint for radosgw
-    if [[ "$KEYSTONE_CATALOG_BACKEND" = 'sql' ]]; then
-        _create_swift_endpoint
-    fi
+    _create_swift_endpoint
 
     # Create radosgw service user with admin privileges
     create_service_user "radosgw" "admin"