diff options
| author |   Juan Antonio Osorio Robles <jaosorior@redhat.com> | 2017-11-01 17:59:59 +0200 |
|---|---|---|
| committer |   Emilien Macchi <emilien@redhat.com> | 2017-11-04 05:23:26 +0000 |
| commit | 2eb7674065b3be298a50e4c9987f38f36b287e80 (patch) | |
| tree | bd91867e6ba6f005cc479a593f0bcf87e7ae0b6e | |
| parent | 6e27339c4037604d19444e7bf2709e59944d0c48 (diff) | |
Certmonger: Only notify haproxy class if it's defined
The haproxy certmonger resource (which requests the HAProxy certs)
expected the haproxy puppet manifests to run alongside if we're using a
local CA. This is no longer the case in containerized environments, e.g.
the containerized undercloud. This makes that optional.
Change-Id: I2764ca1674dcd5ecd7886233bb5e9795ee697be3
(cherry picked from commit abd7a9486d8fb5cad7f6f0b48a466597f1d1bf71)
| -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'] } } |