openstack/tripleo-heat-templates
Code Issues Proposed changes

Enable Ceph RGW 'account in url' option

Browse Source 
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)
This commit is contained in:
Giulio Fidente 2019-04-29 17:49:48 +02:00
parent 14f4f239d6
commit 086238e911
3 changed files with 82 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
deployment/ceph-ansible/ceph-base.yaml
View File

@ -365,6 +365,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

6
network/endpoints/endpoint_data.yaml
View File

@ -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:

147
network/endpoints/endpoint_map.yaml
View File

@ -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: