aboutsummaryrefslogtreecommitdiffstats
path: root/manifests/profile/base
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-08-03 05:11:13 +0000
committerGerrit Code Review <review@openstack.org>2016-08-03 05:11:13 +0000
commit015bec87ab901a424826bd04122cf24aa98cc42a (patch)
tree0eda6e6010a82b5eee532b352c83e03f766f0913 /manifests/profile/base
parentcb44295956024e6423d00ea174ba4ef6dbffc630 (diff)
parent70494971e6a647fe6fc16b6660291133aa939bbb (diff)
Merge "Run local CA trust before haproxy deployment"
Diffstat (limited to 'manifests/profile/base')
-rw-r--r--manifests/profile/base/haproxy.pp4
1 files changed, 3 insertions, 1 deletions
diff --git a/manifests/profile/base/haproxy.pp b/manifests/profile/base/haproxy.pp
index 8e73ce3..7951941 100644
--- a/manifests/profile/base/haproxy.pp
+++ b/manifests/profile/base/haproxy.pp
@@ -68,7 +68,9 @@ class tripleo::profile::base::haproxy (
# This is only needed for certmonger's local CA. For any other CA this
# operation (trusting the CA) should be done by the deployer.
if $certmonger_ca == 'local' {
- include ::tripleo::certmonger::ca::local
+ class { '::tripleo::certmonger::ca::local':
+ notify => Class['::tripleo::haproxy']
+ }
}
Certmonger_certificate {