[baremetal] Stein, Bionic, py3 support

[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 759bdc1..31bfedd 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
@@ -7,25 +7,25 @@
 ##############################################################################
 ---
 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
   - system.sphinx.server.doc.reclass
   - service.keepalived.cluster.single
   - system.keepalived.cluster.instance.openstack_web_public_vip
+  - cluster.all-mcp-arch-common.backports
 parameters:
   _param:
     cluster_vip_address: ${_param:openstack_proxy_address}
     keepalived_openstack_web_public_vip_address: ${_param:cluster_vip_address}
     keepalived_openstack_web_public_vip_interface: ${_param:single_nic}
+    keepalived_openstack_web_public_vip_password: ${_param:opnfv_main_password}
     keepalived_vip_address: ${_param:openstack_proxy_control_address}
     keepalived_vip_interface: ${_param:control_nic}
     keepalived_vip_virtual_router_id: 240
@@ -40,9 +40,6 @@ parameters:
       package:
         libapache2-mod-wsgi:
           version: latest
-      kernel:
-        ~boot_options:
-          - ipv6.disable=0
 {%- if not conf.MCP_VCP %}
   nginx:
     server:
@@ -53,8 +50,6 @@ parameters:
             address: ${_param:openstack_proxy_address}
         nginx_proxy_openstack_api_aodh:
           <<: *nginx_openstack_proxy_address
-        nginx_proxy_openstack_api_ceilometer:
-          <<: *nginx_openstack_proxy_address
         nginx_proxy_openstack_api_cinder:
           <<: *nginx_openstack_proxy_address
         nginx_proxy_openstack_api_glance:
@@ -100,5 +95,6 @@ parameters:
           args: 'nginx'
   apache:
     server:
+      mod_wsgi: libapache2-mod-wsgi-py3
       bind:
         listen_default_ports: false