diff options
| author |   Sofer Athlan-Guyot <sathlang@redhat.com> | 2016-11-08 10:16:53 +0100 |
|---|---|---|
| committer | Sofer Athlan-Guyot <sathlang@redhat.com> | 2016-11-08 18:35:11 +0100 |
| commit | b11d048e55fc20a90bcf11eed0f4cea5e1b45f7c (patch) | |
| tree | 083e1890ea5fff6a3c2505a2d04461c7620b3300 | |
| parent | 8a4fc9c18e8ebfccc7f5bd0c4820c87bebd61d31 (diff) | |
Better way to ensure keepalived before haproxy.
The lastest patchset of https://review.openstack.org/393361 was actually
not working.
The `if defined` idiom depends on *evaluation* order.
At the time it's red in the haproxy.pp class, the line that loads the
class 'haproxy' has still not yet been reached and thus the `defined`
result is false. The constraint is not added.
For this reason, the use of `defined` in module is not advised by
puppetlabs[1].
[1] https://docs.puppet.com/puppet/latest/reference/function.html#defined
Change-Id: Ibd352cb313f8863d62db8987419378bed5b87256
Relates-To: #1638029
| -rw-r--r-- | manifests/haproxy.pp | 2 | ||||
| -rw-r--r-- | manifests/keepalived.pp | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/manifests/haproxy.pp b/manifests/haproxy.pp index 7c5ff39..2ca7a06 100644 --- a/manifests/haproxy.pp +++ b/manifests/haproxy.pp @@ -599,6 +599,8 @@ class tripleo::haproxy ( # This code will be removed once we switch undercloud and overcloud to use both haproxy & keepalived roles. if $keepalived { include ::tripleo::keepalived + # Make sure keepalive starts before haproxy. + Class['::keepalived::service'] -> Class['::haproxy'] } # TODO(bnemec): When we have support for SSL on private and admin endpoints, diff --git a/manifests/keepalived.pp b/manifests/keepalived.pp index 515dcd0..0e9262d 100644 --- a/manifests/keepalived.pp +++ b/manifests/keepalived.pp @@ -158,8 +158,4 @@ class tripleo::keepalived ( priority => 101, } } - # Make sure keepalive starts before haproxy. - if (defined(Class['::haproxy'])) { - Class['::keepalived::service'] -> Class['::haproxy'] - } } |