openstack
/
fuel-library
Code Issues Proposed changes

Add possibility to manage rgw_s3_auth_use_keystone 

This patch add possibility to manage from hiera usage of
S3 auth for radosgw using keystone.

Closes-Bug: 1595894
Change-Id: Ide25386737628555f47e5548a6889b38c9549d00
This commit is contained in:
Oleksiy Molchanov 2016-06-23 17:10:52 +03:00
parent f04554ea6a
commit 0587ad63f7
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
deployment/puppet/osnailyfacter/manifests/ceph/radosgw.pp
View File

@ -15,6 +15,7 @@ class osnailyfacter::ceph::radosgw {
$rgw_keystone_revocation_interval = '1000000'
$rgw_keystone_token_cache_size = '10'
$rgw_init_timeout = pick($storage_hash['rgw_init_timeout'], '360000')
$auth_s3_keystone_ceph = pick($storage_hash['auth_s3_keystone_ceph'], false)
$service_endpoint = hiera('service_endpoint')
$management_vip = hiera('management_vip')
@ -82,7 +83,7 @@ class osnailyfacter::ceph::radosgw {
rgw_keystone_admin_token => $keystone_hash['admin_token'],
rgw_keystone_token_cache_size => $rgw_keystone_token_cache_size,
rgw_keystone_accepted_roles => $rgw_keystone_accepted_roles,
rgw_s3_auth_use_keystone => false,
rgw_s3_auth_use_keystone => $auth_s3_keystone_ceph,
use_pki => false,
}

11
tests/noop/spec/hosts/ceph/radosgw_spec.rb
View File

@ -12,10 +12,11 @@ describe manifest do
ssl_hash = Noop.hiera_structure('use_ssl', {})
storage_hash = Noop.hiera_hash 'storage'
rgw_large_pool_name = '.rgw'
rgw_large_pool_pg_nums = storage_hash['per_pool_pg_nums'][rgw_large_pool_name]
rgw_id = 'radosgw.gateway'
radosgw_auth_key = "client.#{rgw_id}"
rgw_large_pool_name = '.rgw'
rgw_large_pool_pg_nums = storage_hash['per_pool_pg_nums'][rgw_large_pool_name]
auth_s3_keystone_ceph = storage_hash['auth_s3_keystone_ceph']
rgw_id = 'radosgw.gateway'
radosgw_auth_key = "client.#{rgw_id}"
let(:gateway_name) {
'radosgw.gateway'
@ -81,7 +82,7 @@ describe manifest do
it 'should configure radosgw keystone' do
should contain_ceph__rgw__keystone(gateway_name).with(
'rgw_keystone_url' => admin_identity_url,
'rgw_s3_auth_use_keystone' => false,
'rgw_s3_auth_use_keystone' => auth_s3_keystone_ceph,
'use_pki' => false,
)
end