Merge "Fix barbican integration on compute nodes"

[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 5ddb986..c23b509 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
@@ -14,6 +14,7 @@ classes:
   - system.nginx.server.proxy.openstack_web
   - system.nginx.server.proxy.openstack.aodh
   - system.nginx.server.proxy.openstack.ceilometer
+  - system.apache.server.single
   - system.horizon.server.single
   - system.salt.minion.cert.proxy
   - system.sphinx.server.doc.reclass
@@ -39,15 +40,6 @@ parameters:
         libapache2-mod-wsgi:
           version: latest
 {%- if not conf.MCP_VCP %}
-    # Set up routes similar to prx*ovs-ha
-    network:
-      interface:
-        br-ex:
-          route:
-            public:
-              address: 0.0.0.0
-              netmask: 0.0.0.0
-              gateway: ${_param:opnfv_net_public_gw}
   nginx:
     server:
       # NOTE(armband): Define host.address for all proxies for uniformity
@@ -67,6 +59,9 @@ parameters:
           <<: *nginx_openstack_proxy_address
         nginx_proxy_openstack_api_heat_cfn:
           <<: *nginx_openstack_proxy_address
+        nginx_proxy_openstack_api_heat_cloudwatch:
+          <<: *nginx_openstack_proxy_address
+          enabled: false
         nginx_proxy_openstack_api_keystone:
           <<: *nginx_openstack_proxy_address
         nginx_proxy_openstack_api_keystone_private:
@@ -75,8 +70,6 @@ parameters:
           <<: *nginx_openstack_proxy_address
         nginx_proxy_openstack_api_nova:
           <<: *nginx_openstack_proxy_address
-        nginx_proxy_openstack_api_nova_ec2:
-          <<: *nginx_openstack_proxy_address
         nginx_proxy_openstack_web:
           <<: *nginx_openstack_proxy_address
         nginx_ssl_redirect_openstack_web:
@@ -101,3 +94,7 @@ parameters:
       vrrp_scripts:
         check_pidof:
           args: 'nginx'
+  apache:
+    server:
+      bind:
+        listen_default_ports: false