Merge "[ha] Run OpenDaylight in cluster mode"

[fuel.git] / mcp / reclass / classes / cluster / mcp-common-ha / openstack_proxy.yml.j2

diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_proxy.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_proxy.yml.j2
index c23b509..ead2ac8 100644 (file)
--- a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_proxy.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_proxy.yml.j2
@@ -8,12 +8,14 @@
 ---
 classes:
   - system.linux.system.repo.mcp.mirror.v1.openstack
+  - system.linux.system.single.simple
   - system.nginx.server.single
   - system.nginx.server.proxy.openstack_api
   - system.nginx.server.proxy.openstack_vnc
   - system.nginx.server.proxy.openstack_web
   - system.nginx.server.proxy.openstack.aodh
   - system.nginx.server.proxy.openstack.ceilometer
+  - system.nginx.server.proxy.openstack.barbican
   - system.apache.server.single
   - system.horizon.server.single
   - system.salt.minion.cert.proxy
@@ -39,6 +41,9 @@ parameters:
       package:
         libapache2-mod-wsgi:
           version: latest
+      kernel:
+        ~boot_options:
+          - ipv6.disable=0
 {%- if not conf.MCP_VCP %}
   nginx:
     server: