openstack
/
puppet-tripleo
Code Issues Proposed changes

Merge "Set rgw_keystone_revocation_interval to 0 for ceph::rgw::keystone"

This commit is contained in:
Zuul 2018-02-19 22:43:30 +00:00 committed by Gerrit Code Review
parent 5361b3f3d3 2895fbe982
commit 85ccd5792c
2 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
manifests/profile/base/ceph/rgw.pp
View File

@ -77,21 +77,23 @@ class tripleo::profile::base::ceph::rgw (
if $step >= 4 {
if $rgw_keystone_version == 'v2.0' {
ceph::rgw::keystone { $rgw_name:
rgw_keystone_accepted_roles => ['admin', 'Member'],
use_pki => false,
rgw_keystone_admin_token => $keystone_admin_token,
rgw_keystone_url => $keystone_url,
user => 'ceph',
rgw_keystone_accepted_roles => ['admin', 'Member'],
use_pki => false,
rgw_keystone_admin_token => $keystone_admin_token,
rgw_keystone_url => $keystone_url,
user => 'ceph',
rgw_keystone_revocation_interval => 0,
}
}
else
{
ceph::rgw::keystone { $rgw_name:
rgw_keystone_accepted_roles => ['admin', 'Member'],
use_pki => false,
rgw_keystone_url => $keystone_url,
rgw_keystone_version => $rgw_keystone_version,
user => 'ceph',
rgw_keystone_accepted_roles => ['admin', 'Member'],
use_pki => false,
rgw_keystone_url => $keystone_url,
rgw_keystone_version => $rgw_keystone_version,
user => 'ceph',
rgw_keystone_revocation_interval => 0,
}
}
}

16
spec/classes/tripleo_profile_base_ceph_rgw_spec.rb
View File

@ -78,10 +78,11 @@ describe 'tripleo::profile::base::ceph::rgw' do
:inject => true
)
is_expected.to contain_ceph__rgw__keystone('radosgw.gateway').with(
:rgw_keystone_accepted_roles => ['admin', 'Member'],
:use_pki => false,
:rgw_keystone_admin_token => 'token',
:rgw_keystone_url => 'url'
:rgw_keystone_accepted_roles => ['admin', 'Member'],
:use_pki => false,
:rgw_keystone_admin_token => 'token',
:rgw_keystone_url => 'url',
:rgw_keystone_revocation_interval => 0
)
end
end
@ -90,9 +91,10 @@ describe 'tripleo::profile::base::ceph::rgw' do
let(:params) { default_params.merge({ :step => 4, :rgw_keystone_version => 'v3' }) }
it 'should include rgw configuration' do
is_expected.to contain_ceph__rgw__keystone('radosgw.gateway').with(
:rgw_keystone_accepted_roles => ["admin", "Member"],
:use_pki => false,
:rgw_keystone_url => 'url'
:rgw_keystone_accepted_roles => ["admin", "Member"],
:use_pki => false,
:rgw_keystone_url => 'url',
:rgw_keystone_revocation_interval => 0
)
end
end