summaryrefslogtreecommitdiffstats
path: root/mcp/reclass
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2019-12-30 16:12:14 +0100
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2019-12-31 07:48:30 +0000
commit991bd80d1ac3245edba257ae8aeec74278ca74a3 (patch)
tree387f4c7f8e98153b6561d953a97b06d55624670c /mcp/reclass
parentd8f0a6b4fd9c3cb10780abcbd9b446c48b08cced (diff)
noha: Re-enable Horizon dashboard, fix CSS
- ha, noha: Fix misaligned python 3 requirement for Horizon: * python3-pylibmc - ha, noha: Partially revert commit 63b712d: "[Horizon] Drop the obsolete Horizon workaround" Since we switched back from MCP Horizon package to UCA, fix misaligned expected static resources location. - noha: Enable nginx proxy on ctl01 node for serving the Horizon dashboard at http://<cluster public VIP>:80 (http only, no SSL). Change-Id: I5f930a5826a818791183d3910aa0e5607924e8f3 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit af1a4adfcc75b1dae16aee766679fcd224158d00)
Diffstat (limited to 'mcp/reclass')
-rw-r--r--mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j27
-rw-r--r--mcp/reclass/classes/cluster/mcp-common-noha/openstack_init.yml.j26
2 files changed, 13 insertions, 0 deletions
diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2
index 3d9dcf5f9..e383edd16 100644
--- a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2
@@ -56,6 +56,8 @@ classes:
- system.apache.server.site.barbican
- system.apache.server.single
- system.horizon.server.single
+ - system.nginx.server.single
+ - system.nginx.server.proxy.openstack_web
- service.haproxy.proxy.single
{%- if '-sfc-' in conf.MCP_DEPLOY_SCENARIO %}
- system.keystone.client.service.tacker
@@ -238,3 +240,8 @@ parameters:
server:
env_variables:
hostname: localhost
+ nginx:
+ server:
+ site:
+ nginx_ssl_redirect_openstack_web:
+ enabled: false
diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_init.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_init.yml.j2
index 8fe37f9ef..782dd49dc 100644
--- a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_init.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_init.yml.j2
@@ -54,6 +54,12 @@ parameters:
horizon_identity_host: ${_param:cluster_vip_address}
horizon_identity_encryption: none
horizon_identity_version: 3
+ horizon_public_protocol: http
+ horizon_public_port: 80
+ apache_mods_status_enabled: false
+ nginx_server_site_nginx_proxy_openstack_web_enabled: true
+ nginx_proxy_ssl:
+ enabled: false
barbican_version: ${_param:openstack_version}
barbican_service_host: ${_param:cluster_local_address}