Skip to content

Commit

Permalink
Fix haproxy precheck when kolla_externally_managed_cert is used
Browse files Browse the repository at this point in the history
Signed-off-by: Marc 'risson' Schmitt <marc.schmitt@risson.space>
Closes-Bug: #1940286
Change-Id: I647f8615e9fd0cc0db7c737ce4afbd1bdd0d40d4
  • Loading branch information
rissson committed Aug 18, 2021
1 parent ea008fd commit 0858d54
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
8 changes: 4 additions & 4 deletions ansible/roles/haproxy/tasks/precheck.yml
Expand Up @@ -47,17 +47,17 @@
register: haproxy_cert_file
changed_when: false
when:
- kolla_enable_tls_external | bool
- not kolla_externally_managed_cert | bool
- kolla_enable_tls_external | bool

- name: Fail if external haproxy certificate is absent
run_once: true
fail:
msg: "External haproxy certificate file is not found. It is configured via 'kolla_external_fqdn_cert'"
when:
- not kolla_externally_managed_cert | bool
- kolla_enable_tls_external | bool
- not haproxy_cert_file.stat.exists
- not kolla_externally_managed_cert | bool

- name: Checking if internal haproxy certificate exists
run_once: true
Expand All @@ -67,17 +67,17 @@
register: haproxy_internal_cert_file
changed_when: false
when:
- kolla_enable_tls_internal | bool
- not kolla_externally_managed_cert | bool
- kolla_enable_tls_internal | bool

- name: Fail if internal haproxy certificate is absent
run_once: true
fail:
msg: "Internal haproxy certificate file is not found. It is configured via 'kolla_internal_fqdn_cert'"
when:
- not kolla_externally_managed_cert | bool
- kolla_enable_tls_internal | bool
- not haproxy_internal_cert_file.stat.exists
- not kolla_externally_managed_cert | bool

- name: Checking the kolla_external_vip_interface is present
fail: "msg='Please check the kolla_external_vip_interface property - interface {{ kolla_external_vip_interface }} not found'"
Expand Down
@@ -0,0 +1,4 @@
---
fixes:
- |
Fixes HAProxy prechecks when ``kolla_externally_managed_cert`` is used.

0 comments on commit 0858d54

Please sign in to comment.