Merge "Always update the local certmonger ca cert" into stable/ussuri
This commit is contained in:
commit
721f0541f7
@ -37,7 +37,6 @@ class tripleo::certmonger::ca::local(
|
||||
exec { 'extract-and-trust-ca':
|
||||
command => "${extract_cmd} && ${trust_ca_cmd}",
|
||||
path => '/usr/bin',
|
||||
unless => "test -e ${ca_pem} && openssl x509 -checkend 0 -noout -in ${ca_pem}",
|
||||
tries => 5,
|
||||
try_sleep => 1,
|
||||
notify => File[$ca_pem]
|
||||
|
@ -33,9 +33,7 @@ describe 'tripleo::certmonger::ca::local' do
|
||||
end
|
||||
|
||||
it 'should extract CA cert' do
|
||||
is_expected.to contain_exec('extract-and-trust-ca').with(
|
||||
:unless => "test -e #{params[:ca_pem]} && openssl x509 -checkend 0 -noout -in #{params[:ca_pem]}",
|
||||
)
|
||||
is_expected.to contain_exec('extract-and-trust-ca')
|
||||
end
|
||||
|
||||
it 'set the correct permissions for the CA certificate file' do
|
||||
|
Loading…
Reference in New Issue
Block a user