summaryrefslogtreecommitdiffstats
path: root/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2019-12-31 12:24:53 +0000
committerGerrit Code Review <gerrit@opnfv.org>2019-12-31 12:24:53 +0000
commit804cb68bc61126d2e27e8ca9d9abfe2cd0af0cfb (patch)
treea6fcaa960831a29d9465c53cef232b43c8fd432e /mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2
parent15d12dc0eb1bccf37a6b96c5c2188d94f199c62b (diff)
parent991bd80d1ac3245edba257ae8aeec74278ca74a3 (diff)
Merge "noha: Re-enable Horizon dashboard, fix CSS" into stable/iruya
Diffstat (limited to 'mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2')
-rw-r--r--mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j27
1 files changed, 7 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