openstack/fuel-library
Code Issues Proposed changes

Merge "Revert "Configure s3 keystone authentication for RadosGW""

Browse Source
This commit is contained in:
Jenkins 2016-02-02 21:43:46 +00:00 committed by Gerrit Code Review
commit 8df7ffbcaf
4 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
deployment/puppet/ceph/manifests/init.pp
View File

@ -57,7 +57,6 @@ class ceph (
$rgw_pub_ip = $cluster_node_address,
$rgw_adm_ip = $cluster_node_address,
$rgw_int_ip = $cluster_node_address,
$rgw_s3_auth_use_keystone = true,
$rgw_large_pool_name = '.rgw',
$rgw_large_pool_pg_nums = '512',

2
deployment/puppet/ceph/manifests/radosgw.pp
View File

@ -34,7 +34,6 @@ class ceph::radosgw (
$pub_ip = $::ceph::rgw_pub_ip,
$adm_ip = $::ceph::rgw_adm_ip,
$int_ip = $::ceph::rgw_int_ip,
$rgw_s3_auth_use_keystone = $::ceph::rgw_s3_auth_use_keystone,
#rgw Log settings
$use_syslog = $::ceph::use_syslog,
@ -115,7 +114,6 @@ class ceph::radosgw (
"client.${rgw_id}/rgw_keystone_accepted_roles": value => $rgw_keystone_accepted_roles;
"client.${rgw_id}/rgw_keystone_token_cache_size": value => $rgw_keystone_token_cache_size;
"client.${rgw_id}/rgw_keystone_revocation_interval": value => $rgw_keystone_revocation_interval;
"client.${rgw_id}/rgw_s3_auth_use_keystone": value => $rgw_s3_auth_use_keystone;
}
if ($rgw_use_pki) {

1
deployment/puppet/osnailyfacter/modular/ceph/radosgw.pp
View File

@ -92,7 +92,6 @@ if $use_ceph and $storage_hash['objects_ceph'] {
rgw_keystone_accepted_roles => '_member_, Member, admin, swiftoperator',
rgw_keystone_revocation_interval => '1000000',
rgw_nss_db_path => '/etc/ceph/nss',
rgw_s3_auth_use_keystone => hiera('rgw_s3_auth_use_keystone', true),
rgw_large_pool_name => $radosgw_large_pool_name,
rgw_large_pool_pg_nums => pick($storage_hash['per_pool_pg_nums'][$radosgw_large_pool_name], '512'),

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

@ -45,7 +45,6 @@ describe manifest do
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_s3_auth_use_keystone = Noop.hiera 'rgw_s3_auth_use_keystone', true
it 'should configure apache mods' do
if facts[:osfamily] == 'Debian'
@ -65,16 +64,6 @@ describe manifest do
)
}
it 'should configure s3 keystone authentication for RadosGW' do
should contain_class('ceph::radosgw').with(
:rgw_use_keystone => true,
:rgw_keystone_url => admin_url,
)
should contain_ceph_conf("client.#{rgw_id}/rgw_s3_auth_use_keystone").with(
:value => rgw_s3_auth_use_keystone,
)
end
it 'should have explicit ordering between LB classes and particular actions' do
expect(graph).to ensure_transitive_dependency("Haproxy_backend_status[keystone-public]", "Class[ceph::keystone]")
expect(graph).to ensure_transitive_dependency("Haproxy_backend_status[keystone-admin]", "Class[ceph::keystone]")