openstack/puppet-ceph
Code Issues Proposed changes

Puppet incorrectly sets rgw_keystone_revocation_interval to absent

Browse Source 
Puppet incorrectly sets rgw_keystone_revocation_interval when use_pki
is false. According to (1), the default value will be 15*60. This value
should be 0 when not using PKI tokens. This patch ensures the parameter
is set to the value passed into the module.

1: http://docs.ceph.com/docs/master/radosgw/config-ref/

Change-Id: Ic8abf0c9d54847dad72824db211a5850737a05b8
Closes-bug: 1770234
This commit is contained in:
Keith Schincke
2018-05-09 13:58:09 -04:00
parent f3f166935b
commit 16d2799998
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/rgw/keystone.pp
View File

@@ -186,7 +186,7 @@ certutil -d ${nss_db_path} -L | grep ^signing_cert
} else {
ceph_config {
"client.${name}/nss_db_path": ensure => absent;
"client.${name}/rgw_keystone_revocation_interval": ensure => absent;
"client.${name}/rgw_keystone_revocation_interval": value => $rgw_keystone_revocation_interval;
}
}
}

8
spec/defines/ceph_rgw_keystone_spec.rb
View File

@@ -112,7 +112,7 @@ wget --no-check-certificate http://keystone.default:5000/v2.0/certificates/signi
:rgw_keystone_token_cache_size => 100,
:rgw_s3_auth_use_keystone => false,
:use_pki => false,
:rgw_keystone_revocation_interval => 200,
:rgw_keystone_revocation_interval => 0,
:nss_db_path => '/some/path/to/nss',
:rgw_keystone_implicit_tenants => false,
}
@@ -123,7 +123,7 @@ wget --no-check-certificate http://keystone.default:5000/v2.0/certificates/signi
it { is_expected.to contain_ceph_config('client.radosgw.custom/rgw_keystone_accepted_roles').with_value('_role1_,role2') }
it { is_expected.to contain_ceph_config('client.radosgw.custom/rgw_keystone_token_cache_size').with_value(100) }
it { is_expected.to contain_ceph_config('client.radosgw.custom/rgw_s3_auth_use_keystone').with_value(false) }
it { is_expected.to contain_ceph_config('client.radosgw.custom/rgw_keystone_revocation_interval').with_ensure('absent') }
it { is_expected.to contain_ceph_config('client.radosgw.custom/rgw_keystone_revocation_interval').with_value(0) }
it { is_expected.to contain_ceph_config('client.radosgw.custom/nss_db_path').with_ensure('absent') }
it { is_expected.to contain_ceph_config('client.radosgw.custom/rgw_keystone_implicit_tenants').with_value(false) }
@@ -274,7 +274,7 @@ wget --no-check-certificate http://keystone.default:5000/v2.0/certificates/signi
:rgw_keystone_token_cache_size => 100,
:rgw_s3_auth_use_keystone => false,
:use_pki => false,
:rgw_keystone_revocation_interval => 200,
:rgw_keystone_revocation_interval => 0,
:nss_db_path => '/some/path/to/nss',
:rgw_keystone_implicit_tenants => false,
}
@@ -285,7 +285,7 @@ wget --no-check-certificate http://keystone.default:5000/v2.0/certificates/signi
it { is_expected.to contain_ceph_config('client.radosgw.custom/rgw_keystone_accepted_roles').with_value('_role1_,role2') }
it { is_expected.to contain_ceph_config('client.radosgw.custom/rgw_keystone_token_cache_size').with_value(100) }
it { is_expected.to contain_ceph_config('client.radosgw.custom/rgw_s3_auth_use_keystone').with_value(false) }
it { is_expected.to contain_ceph_config('client.radosgw.custom/rgw_keystone_revocation_interval').with_ensure('absent') }
it { is_expected.to contain_ceph_config('client.radosgw.custom/rgw_keystone_revocation_interval').with_value(0) }
it { is_expected.to contain_ceph_config('client.radosgw.custom/nss_db_path').with_ensure('absent') }
it { is_expected.to contain_ceph_config('client.radosgw.custom/rgw_keystone_implicit_tenants').with_value(false) }