openstack
/
tripleo-heat-templates
Code Issues Proposed changes

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
This commit is contained in:
Giulio Fidente 2019-04-29 17:49:48 +02:00
parent dee66d8983
commit 7c379543cc
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_keystone_revocation_interval: '0'
rgw_s3_auth_use_keystone: 'true' rgw_s3_auth_use_keystone: 'true'
rgw_swift_versioning_enabled: 'true' rgw_swift_versioning_enabled: 'true'
rgw_swift_account_in_url: 'true'
- {get_param: CephConfigOverrides} - {get_param: CephConfigOverrides}
ntp_service_enabled: false ntp_service_enabled: false
generate_fsid: false generate_fsid: false

6
network/endpoints/endpoint_data.yaml
View File

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

147
network/endpoints/endpoint_map.yaml
View File

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