Enable Ceph RGW 'account in url' option

This requires an update of the endpoint but is necessary to be able
to use public-readable containers (like temporary URLs) with RGW.

Change-Id: I6bd11bdf9c74db24c0d21fa600030e9f3b144df0
Closes-Bug: 1826894
(cherry picked from commit 7c379543cc)
(cherry picked from commit 086238e911)

docker/services/ceph-ansible/ceph-base.yaml

@@ -364,6 +364,7 @@ resources:
                   rgw_keystone_implicit_tenants: 'true'
                   rgw_keystone_revocation_interval: '0'
                   rgw_s3_auth_use_keystone: 'true'
+                  rgw_swift_account_in_url: 'true'
                 - {get_param: CephConfigOverrides}
           ntp_service_enabled: false
           generate_fsid: false

network/endpoints/endpoint_data.yaml

@@ -312,15 +312,15 @@ CephRgw:
     Internal:
         net_param: CephRgw
         uri_suffixes:
-            '': /swift/v1
+            '': /swift/v1/AUTH_%(project_id)s
     Public:
         net_param: Public
         uri_suffixes:
-            '': /swift/v1
+            '': /swift/v1/AUTH_%(project_id)s
     Admin:
         net_param: CephRgw
         uri_suffixes:
-            '': /swift/v1
+            '': /swift/v1/AUTH_%(project_id)s
     port: 8080
 
 Sahara:

network/endpoints/endpoint_map.yaml

@@ -652,7 +652,9 @@ outputs:
         protocol:
           get_param: [EndpointMap, CephRgwAdmin, protocol]
         uri:
-          make_url:
+          list_join:
+          - ''
+          - - make_url:
                 scheme:
                   get_param: [EndpointMap, CephRgwAdmin, protocol]
                 host:
@@ -674,7 +676,8 @@ outputs:
                             template: NETWORK_uri
                 port:
                   get_param: [EndpointMap, CephRgwAdmin, port]
-            path: /swift/v1
+                path: /swift/v1/AUTH_
+            - '%(project_id)s'
         uri_no_suffix:
           make_url:
             scheme:
@@ -734,7 +737,9 @@ outputs:
         protocol:
           get_param: [EndpointMap, CephRgwInternal, protocol]
         uri:
-          make_url:
+          list_join:
+          - ''
+          - - make_url:
                 scheme:
                   get_param: [EndpointMap, CephRgwInternal, protocol]
                 host:
@@ -756,7 +761,8 @@ outputs:
                             template: NETWORK_uri
                 port:
                   get_param: [EndpointMap, CephRgwInternal, port]
-            path: /swift/v1
+                path: /swift/v1/AUTH_
+            - '%(project_id)s'
         uri_no_suffix:
           make_url:
             scheme:
@@ -816,7 +822,9 @@ outputs:
         protocol:
           get_param: [EndpointMap, CephRgwPublic, protocol]
         uri:
-          make_url:
+          list_join:
+          - ''
+          - - make_url:
                 scheme:
                   get_param: [EndpointMap, CephRgwPublic, protocol]
                 host:
@@ -838,7 +846,8 @@ outputs:
                             template: NETWORK_uri
                 port:
                   get_param: [EndpointMap, CephRgwPublic, port]
-            path: /swift/v1
+                path: /swift/v1/AUTH_
+            - '%(project_id)s'
         uri_no_suffix:
           make_url:
             scheme: