Browse Source

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

changes/14/786114/1
Zuul 3 weeks ago
committed by Gerrit Code Review
parent
commit
c34e3e3bd0
2 changed files with 1 additions and 4 deletions
  1. +0
    -1
      manifests/certmonger/ca/local.pp
  2. +1
    -3
      spec/classes/tripleo_certmonger_ca_local_spec.rb

+ 0
- 1
manifests/certmonger/ca/local.pp View File

@ -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]


+ 1
- 3
spec/classes/tripleo_certmonger_ca_local_spec.rb View File

@ -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…
Cancel
Save