X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=mcp%2Freclass%2Fclasses%2Fcluster%2Fmcp-common-ha%2Fopenstack_proxy.yml.j2;h=cef23c9eef946e7d50427a3451863723d442f9aa;hb=a2f5e2800be18071f4867121d71e2ace842354ef;hp=d7ccff532c9ffdc29e8ee0eb09455cee3b2bf0e6;hpb=33c017d388bf0f9cef5199c186bec5b4fd01f767;p=fuel.git

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 d7ccff532..cef23c9ee 100644
--- 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,23 +7,25 @@
 ##############################################################################
 ---
 classes:
-  - system.linux.system.repo.mcp.mirror.v1.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
   - 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
@@ -48,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:
@@ -93,3 +93,7 @@ parameters:
       vrrp_scripts:
         check_pidof:
           args: 'nginx'
+  apache:
+    server:
+      bind:
+        listen_default_ports: false