Merge "Fix bogus reference to conditional in octavia upgrade tasks" into stable/queens

This commit is contained in:
Zuul 2019-08-23 21:01:31 +00:00 committed by Gerrit Code Review
commit 122ad2e17f

View File

@ -199,6 +199,9 @@ outputs:
/var/log/containers/octavia and /var/log/containers/httpd/octavia-api. /var/log/containers/octavia and /var/log/containers/httpd/octavia-api.
ignore_errors: true ignore_errors: true
update_tasks: update_tasks:
- name: Set internal tls variable
set_fact:
internal_tls_enabled: {get_param: EnableInternalTLS}
- name: remove TLS proxy if configured and running - name: remove TLS proxy if configured and running
when: when:
- step|int == 2 - step|int == 2
@ -207,6 +210,9 @@ outputs:
name: octavia_api_tls_proxy name: octavia_api_tls_proxy
state: absent state: absent
upgrade_tasks: upgrade_tasks:
- name: Set internal tls variable
set_fact:
internal_tls_enabled: {get_param: EnableInternalTLS}
- when: step|int == 0 - when: step|int == 0
tags: common tags: common
block: block: