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

deployment/octavia/octavia-api-container-puppet.yaml

@@ -307,6 +307,9 @@ outputs:
               /var/log/containers/octavia and /var/log/containers/httpd/octavia-api.
           ignore_errors: true
       update_tasks:
+        - name: Set internal tls variable
+          set_fact:
+            internal_tls_enabled: {get_param: EnableInternalTLS}
         - name: remove TLS proxy if configured and running
           when:
             - step|int == 2
@@ -329,12 +332,18 @@ outputs:
                 path: "/etc/systemd/system/tripleo_octavia_api_tls_proxy"
               when: container_cli == 'podman'
       upgrade_tasks:
+        - name: Set internal tls variable
+          set_fact:
+            internal_tls_enabled: {get_param: EnableInternalTLS}
         - name: remove TLS proxy if configured and running
           when:
             - step|int == 2
             - internal_tls_enabled|bool
           block: *remove_octavia_tls_proxy_tasks
       post_upgrade_tasks:
+        - name: Set internal tls variable
+          set_fact:
+            internal_tls_enabled: {get_param: EnableInternalTLS}
         - when: step|int == 1
           import_role:
             name: tripleo-docker-rm