Skip to content

Commit 7c70bb6

Browse files
Zuulopenstack-gerrit
authored andcommitted
Merge "Fix haproxy precheck when kolla_externally_managed_cert is used" into stable/wallaby
2 parents a40fb76 + 30117a0 commit 7c70bb6

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

ansible/roles/haproxy/tasks/precheck.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,17 +47,17 @@
4747
register: haproxy_cert_file
4848
changed_when: false
4949
when:
50-
- kolla_enable_tls_external | bool
5150
- not kolla_externally_managed_cert | bool
51+
- kolla_enable_tls_external | bool
5252

5353
- name: Fail if external haproxy certificate is absent
5454
run_once: true
5555
fail:
5656
msg: "External haproxy certificate file is not found. It is configured via 'kolla_external_fqdn_cert'"
5757
when:
58+
- not kolla_externally_managed_cert | bool
5859
- kolla_enable_tls_external | bool
5960
- not haproxy_cert_file.stat.exists
60-
- not kolla_externally_managed_cert | bool
6161

6262
- name: Checking if internal haproxy certificate exists
6363
run_once: true
@@ -67,17 +67,17 @@
6767
register: haproxy_internal_cert_file
6868
changed_when: false
6969
when:
70-
- kolla_enable_tls_internal | bool
7170
- not kolla_externally_managed_cert | bool
71+
- kolla_enable_tls_internal | bool
7272

7373
- name: Fail if internal haproxy certificate is absent
7474
run_once: true
7575
fail:
7676
msg: "Internal haproxy certificate file is not found. It is configured via 'kolla_internal_fqdn_cert'"
7777
when:
78+
- not kolla_externally_managed_cert | bool
7879
- kolla_enable_tls_internal | bool
7980
- not haproxy_internal_cert_file.stat.exists
80-
- not kolla_externally_managed_cert | bool
8181

8282
- name: Checking the kolla_external_vip_interface is present
8383
fail: "msg='Please check the kolla_external_vip_interface property - interface {{ kolla_external_vip_interface }} not found'"
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
---
2+
fixes:
3+
- |
4+
Fixes HAProxy prechecks when ``kolla_externally_managed_cert`` is used.

0 commit comments

Comments
 (0)