From 1d3deabcff09e554c39ef5fccbde6d5c65819f70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guilherme=20Steinm=C3=BCller?= Date: Mon, 1 Apr 2019 03:35:12 +0000 Subject: [PATCH] Drop horizon_keystone_host variable The horizon_keystone_host is only used as interpolation for OPENSTACK_KEYSTONE_URL, which we define manually. So horizon_keystone_hosts server no purpose. Change-Id: I693bdb30e3d812592f023c00fbbbd62f069320bf --- defaults/main.yml | 1 - templates/horizon_local_settings.py.j2 | 3 --- 2 files changed, 4 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 2b4beb46..fe34bba0 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -240,7 +240,6 @@ horizon_secure_proxy_ssl_header_django: "HTTP_{{ horizon_secure_proxy_ssl_header # - { url: "http://cluster1.example.com:5000/v2.0", name: "RegionTwo" } ## Horizon's keystone endpoint settings -horizon_keystone_host: "{{ internal_lb_vip_address }}" horizon_keystone_endpoint: "{{ keystone_service_internalurl }}" ## Horizon Multi-Domain Support diff --git a/templates/horizon_local_settings.py.j2 b/templates/horizon_local_settings.py.j2 index 3c3360bf..5a430648 100644 --- a/templates/horizon_local_settings.py.j2 +++ b/templates/horizon_local_settings.py.j2 @@ -178,9 +178,6 @@ AVAILABLE_REGIONS = [ ('{{ item.url }}', '{{ item.name }}'), {% endfor %} ] -{% else %} -# Set Horizon to use a specific Keystone endpoint -OPENSTACK_HOST = "{{ horizon_keystone_host }}" {% endif %} OPENSTACK_KEYSTONE_URL = "{{ horizon_keystone_endpoint }}"