Merge "[fdio] salt-formula-neutron: Fix VPP support patch"

[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 ead2ac8..1cde4d4 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,14 +7,12 @@
 ##############################################################################
 ---
 classes:
-  - system.linux.system.repo.mcp.mirror.v1.openstack
-  - system.linux.system.single.simple
+  - system.linux.system.repo.mcp.apt_mirantis.openstack
   - 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
@@ -41,9 +39,6 @@ parameters:
       package:
         libapache2-mod-wsgi:
           version: latest
-      kernel:
-        ~boot_options:
-          - ipv6.disable=0
 {%- if not conf.MCP_VCP %}
   nginx:
     server:
@@ -54,8 +49,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: