Merge "Enable Ceph RGW 'account in url' option"

openstack-archive · Jun 20, 2019 · 2aaf52e · 2aaf52e
2 parents 5359e7e + 7c37954
commit 2aaf52e
Show file tree

Hide file tree

Showing 3 changed files with 82 additions and 72 deletions.
diff --git a/deployment/ceph-ansible/ceph-base.yaml b/deployment/ceph-ansible/ceph-base.yaml
@@ -372,6 +372,7 @@ resources:
                   rgw_keystone_revocation_interval: '0'
                   rgw_s3_auth_use_keystone: 'true'
                   rgw_swift_versioning_enabled: 'true'
+                  rgw_swift_account_in_url: 'true'
                 - {get_param: CephConfigOverrides}
           ntp_service_enabled: false
           generate_fsid: false

diff --git a/network/endpoints/endpoint_data.yaml b/network/endpoints/endpoint_data.yaml
@@ -309,15 +309,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:

diff --git a/network/endpoints/endpoint_map.yaml b/network/endpoints/endpoint_map.yaml
@@ -650,29 +650,32 @@ outputs:
         protocol:
           get_param: [EndpointMap, CephRgwAdmin, protocol]
         uri:
-          make_url:
-            scheme:
-              get_param: [EndpointMap, CephRgwAdmin, protocol]
-            host:
-              str_replace:
-                template:
-                  get_param: [EndpointMap, CephRgwAdmin, host]
-                params:
-                  CLOUDNAME:
-                    get_param:
-                    - CloudEndpoints
-                    - get_param: [ServiceNetMap, CephRgwNetwork]
-                  IP_ADDRESS:
-                    get_param:
-                    - NetIpMap
-                    - str_replace:
-                        params:
-                          NETWORK:
-                            get_param: [ServiceNetMap, CephRgwNetwork]
-                        template: NETWORK_uri
-            port:
-              get_param: [EndpointMap, CephRgwAdmin, port]
-            path: /swift/v1
+          list_join:
+          - ''
+          - - make_url:
+                scheme:
+                  get_param: [EndpointMap, CephRgwAdmin, protocol]
+                host:
+                  str_replace:
+                    template:
+                      get_param: [EndpointMap, CephRgwAdmin, host]
+                    params:
+                      CLOUDNAME:
+                        get_param:
+                        - CloudEndpoints
+                        - get_param: [ServiceNetMap, CephRgwNetwork]
+                      IP_ADDRESS:
+                        get_param:
+                        - NetIpMap
+                        - str_replace:
+                            params:
+                              NETWORK:
+                                get_param: [ServiceNetMap, CephRgwNetwork]
+                            template: NETWORK_uri
+                port:
+                  get_param: [EndpointMap, CephRgwAdmin, port]
+                path: /swift/v1/AUTH_
+            - '%(project_id)s'
         uri_no_suffix:
           make_url:
             scheme:
@@ -732,29 +735,32 @@ outputs:
         protocol:
           get_param: [EndpointMap, CephRgwInternal, protocol]
         uri:
-          make_url:
-            scheme:
-              get_param: [EndpointMap, CephRgwInternal, protocol]
-            host:
-              str_replace:
-                template:
-                  get_param: [EndpointMap, CephRgwInternal, host]
-                params:
-                  CLOUDNAME:
-                    get_param:
-                    - CloudEndpoints
-                    - get_param: [ServiceNetMap, CephRgwNetwork]
-                  IP_ADDRESS:
-                    get_param:
-                    - NetIpMap
-                    - str_replace:
-                        params:
-                          NETWORK:
-                            get_param: [ServiceNetMap, CephRgwNetwork]
-                        template: NETWORK_uri
-            port:
-              get_param: [EndpointMap, CephRgwInternal, port]
-            path: /swift/v1
+          list_join:
+          - ''
+          - - make_url:
+                scheme:
+                  get_param: [EndpointMap, CephRgwInternal, protocol]
+                host:
+                  str_replace:
+                    template:
+                      get_param: [EndpointMap, CephRgwInternal, host]
+                    params:
+                      CLOUDNAME:
+                        get_param:
+                        - CloudEndpoints
+                        - get_param: [ServiceNetMap, CephRgwNetwork]
+                      IP_ADDRESS:
+                        get_param:
+                        - NetIpMap
+                        - str_replace:
+                            params:
+                              NETWORK:
+                                get_param: [ServiceNetMap, CephRgwNetwork]
+                            template: NETWORK_uri
+                port:
+                  get_param: [EndpointMap, CephRgwInternal, port]
+                path: /swift/v1/AUTH_
+            - '%(project_id)s'
         uri_no_suffix:
           make_url:
             scheme:
@@ -814,29 +820,32 @@ outputs:
         protocol:
           get_param: [EndpointMap, CephRgwPublic, protocol]
         uri:
-          make_url:
-            scheme:
-              get_param: [EndpointMap, CephRgwPublic, protocol]
-            host:
-              str_replace:
-                template:
-                  get_param: [EndpointMap, CephRgwPublic, host]
-                params:
-                  CLOUDNAME:
-                    get_param:
-                    - CloudEndpoints
-                    - get_param: [ServiceNetMap, PublicNetwork]
-                  IP_ADDRESS:
-                    get_param:
-                    - NetIpMap
-                    - str_replace:
-                        params:
-                          NETWORK:
-                            get_param: [ServiceNetMap, PublicNetwork]
-                        template: NETWORK_uri
-            port:
-              get_param: [EndpointMap, CephRgwPublic, port]
-            path: /swift/v1
+          list_join:
+          - ''
+          - - make_url:
+                scheme:
+                  get_param: [EndpointMap, CephRgwPublic, protocol]
+                host:
+                  str_replace:
+                    template:
+                      get_param: [EndpointMap, CephRgwPublic, host]
+                    params:
+                      CLOUDNAME:
+                        get_param:
+                        - CloudEndpoints
+                        - get_param: [ServiceNetMap, PublicNetwork]
+                      IP_ADDRESS:
+                        get_param:
+                        - NetIpMap
+                        - str_replace:
+                            params:
+                              NETWORK:
+                                get_param: [ServiceNetMap, PublicNetwork]
+                            template: NETWORK_uri
+                port:
+                  get_param: [EndpointMap, CephRgwPublic, port]
+                path: /swift/v1/AUTH_
+            - '%(project_id)s'
         uri_no_suffix:
           make_url:
             scheme: