Merge "Extract local CA if it expired"

changes/03/525203/3
Zuul 5 years ago committed by Gerrit Code Review
commit 8bf696e1f7
  1. 2
      manifests/certmonger/ca/local.pp
  2. 2
      spec/classes/tripleo_certmonger_ca_local_spec.rb

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

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

Loading…
Cancel
Save