noha: Re-enable Horizon dashboard, fix CSS

[fuel.git] / mcp / reclass / classes / cluster / mcp-common-noha / openstack_control.yml.j2

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 504ee08..e383edd 100644 (file)
--- 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
@@ -85,10 +87,8 @@ parameters:
         volume_device_name: sdc
       pkgs:
         - keystone
-        - python-psycopg2
-        - python-mysqldb
-        - python-openstackclient
-        - python-tornado
+        - python3-memcache
+        - python3-openstackclient
     client:
       enabled: true
       resources:
@@ -210,8 +210,6 @@ parameters:
       global_physnet_mtu: ${_param:interface_mtu}
       backend:
         external_mtu: ${_param:interface_mtu}
-      pkgs:
-        - neutron-server
 {%- if '-bgpvpn-' in conf.MCP_DEPLOY_SCENARIO %}
       bgp_vpn:
         enabled: True
@@ -242,3 +240,8 @@ parameters:
     server:
       env_variables:
         hostname: localhost
+  nginx:
+    server:
+      site:
+        nginx_ssl_redirect_openstack_web:
+          enabled: false