diff options
author | Zuul <zuul@review.openstack.org> | 2017-11-07 05:05:07 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2017-11-07 05:05:07 +0000 |
commit | 13b51f775749834435341ff16033547060926902 (patch) | |
tree | c0c5e532c110a01ec823632f892cfd23895527f0 | |
parent | a885ec358c1c91747c77e7f0dc7da5ae990b475e (diff) | |
parent | 2eb7674065b3be298a50e4c9987f38f36b287e80 (diff) |
Merge "Certmonger: Only notify haproxy class if it's defined" into stable/pike
-rw-r--r-- | manifests/certmonger/haproxy.pp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/manifests/certmonger/haproxy.pp b/manifests/certmonger/haproxy.pp index 97efe59..cff9f34 100644 --- a/manifests/certmonger/haproxy.pp +++ b/manifests/certmonger/haproxy.pp @@ -63,8 +63,9 @@ define tripleo::certmonger::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' { - class { '::tripleo::certmonger::ca::local': - notify => Class['::tripleo::haproxy'] + include ::tripleo::certmonger::ca::local + if defined(Class['::haproxy']) { + Class['::tripleo::certmonger::ca::local'] ~> Class['::haproxy'] } } |