Skip to content

Commit 9c80df3

Browse files
committed
horizon: move horizon_enable_tls_backend to group_vars
This variable is referenced by horizon_listen_port, which becomes undefined outside of the horizon role. One symptom of this is that the hostvars variable becomes undefined when referenced for debugging purposes. This issue was introduced by Ibb5ad1a5d1bbc74bcb62610d77852d8124c4a323, which has been backported to Victoria. This change fixes the issue by moving horizon_enable_tls_backend to group_vars. TrivialFix Change-Id: I1fc4e2a24fe096a49434d7e16851e63efd25d74c (cherry picked from commit 4c6d777)
1 parent 918397c commit 9c80df3

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

ansible/group_vars/all.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1046,6 +1046,8 @@ enable_keystone_horizon_policy_file: "{{ enable_keystone }}"
10461046
enable_neutron_horizon_policy_file: "{{ enable_neutron }}"
10471047
enable_nova_horizon_policy_file: "{{ enable_nova }}"
10481048

1049+
horizon_enable_tls_backend: "{{ kolla_enable_tls_backend }}"
1050+
10491051
horizon_internal_endpoint: "{{ internal_protocol }}://{{ kolla_internal_fqdn | put_address_in_context('url') }}:{{ horizon_tls_port if kolla_enable_tls_internal | bool else horizon_port }}"
10501052
horizon_public_endpoint: "{{ public_protocol }}://{{ kolla_external_fqdn | put_address_in_context('url') }}:{{ horizon_tls_port if kolla_enable_tls_external | bool else horizon_port }}"
10511053

ansible/roles/horizon/defaults/main.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -145,11 +145,6 @@ horizon_murano_dev_mode: "{{ kolla_dev_mode }}"
145145
horizon_source_version: "{{ kolla_source_version }}"
146146
horizon_murano_source_version: "{{ kolla_source_version }}"
147147

148-
####################
149-
# TLS
150-
####################
151-
horizon_enable_tls_backend: "{{ kolla_enable_tls_backend }}"
152-
153148
# This variable was created for administrators to define which one of the Keystone's URLs should be configured in Horizon.
154149
# In some cases, such as when using OIDC, horizon will need to be configured with Keystone's public URL.
155150
# Therefore, instead of overriding the whole "horizon_keystone_url", this change allows an easier integration because

0 commit comments

Comments
 (0)