openstack/puppet-tripleo
Code Issues Proposed changes

Merge "Always update the local certmonger ca cert" into stable/ussuri

Browse Source
This commit is contained in:
Zuul 2021-04-13 08:43:29 +00:00 committed by Gerrit Code Review
commit 721f0541f7
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
manifests/certmonger/ca/local.pp
View File

@ -37,7 +37,6 @@ class tripleo::certmonger::ca::local(
exec { 'extract-and-trust-ca': exec { 'extract-and-trust-ca':
command => "${extract_cmd} && ${trust_ca_cmd}", command => "${extract_cmd} && ${trust_ca_cmd}",
path => '/usr/bin', path => '/usr/bin',
unless => "test -e ${ca_pem} && openssl x509 -checkend 0 -noout -in ${ca_pem}",
tries => 5, tries => 5,
try_sleep => 1, try_sleep => 1,
notify => File[$ca_pem] notify => File[$ca_pem]

4
spec/classes/tripleo_certmonger_ca_local_spec.rb
View File

@ -33,9 +33,7 @@ describe 'tripleo::certmonger::ca::local' do
end end
it 'should extract CA cert' do it 'should extract CA cert' do
is_expected.to contain_exec('extract-and-trust-ca').with( is_expected.to contain_exec('extract-and-trust-ca')
:unless => "test -e #{params[:ca_pem]} && openssl x509 -checkend 0 -noout -in #{params[:ca_pem]}",
)
end end
it 'set the correct permissions for the CA certificate file' do it 'set the correct permissions for the CA certificate file' do