aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-09-23 16:32:25 +0000
committerGerrit Code Review <review@openstack.org>2016-09-23 16:32:25 +0000
commit6ade8653d517b9759942e0a18ca8d8897d2d04c7 (patch)
tree0aa94c479ddb21b90ae1db5ffc275279d8546868
parentceccbfdd7b7a098741d79003f0741eee2a02df4d (diff)
parent9b974df7a2a20741b64b72e8980bc47c13b6166c (diff)
Merge "certmonger: improve orchestration for puppet4"
-rw-r--r--manifests/certmonger/ca/local.pp10
1 files changed, 6 insertions, 4 deletions
diff --git a/manifests/certmonger/ca/local.pp b/manifests/certmonger/ca/local.pp
index ea08dec..b7b7328 100644
--- a/manifests/certmonger/ca/local.pp
+++ b/manifests/certmonger/ca/local.pp
@@ -29,9 +29,11 @@ class tripleo::certmonger::ca::local(
$extract_cmd = "openssl pkcs12 -in ${ca_pkcs12} -out ${ca_pem} -nokeys -nodes -passin pass:''"
$trust_ca_cmd = 'update-ca-trust extract'
exec { 'extract-and-trust-ca':
- command => "${extract_cmd} && ${trust_ca_cmd}",
- path => '/usr/bin',
- creates => $ca_pem,
- require => Package['certmonger'],
+ command => "${extract_cmd} && ${trust_ca_cmd}",
+ path => '/usr/bin',
+ creates => $ca_pem,
+ tries => 5,
+ try_sleep => 1,
+ require => Service['certmonger'],
}
}