Smooth down API proxy config

* heat: remove deprecated AWS compatible CloudWatch API
* nova: placement API responds with 405 when doing GET to root URL

Change-Id: I545e5b0fc5b57b516a4b1d8c9e33ea1d5d61ed76
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>

diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2
index ebec944..cdebe3f 100644 (file)
--- a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2
@@ -131,6 +131,16 @@ parameters:
       cacert: /etc/ssl/certs/mcp_os_cacert
       openrc_extra:
         volume_device_name: vdc
+  haproxy:
+    proxy:
+      listen:
+        nova_placement_api:
+          health-check:
+            http:
+              ~options:
+                - expect status 405
+        ~heat_cloudwatch_api:
+          enabled: false
   bind:
     server:
       control:

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 34ec106..5ddb986 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
@@ -67,8 +67,6 @@ 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
         nginx_proxy_openstack_api_keystone:
           <<: *nginx_openstack_proxy_address
         nginx_proxy_openstack_api_keystone_private:
@@ -85,6 +83,12 @@ parameters:
           <<: *nginx_openstack_proxy_address
         nginx_static_reclass_doc:
           <<: *nginx_openstack_proxy_address
+{%- else %}
+  nginx:
+    server:
+      site:
+        nginx_proxy_openstack_api_heat_cloudwatch:
+          enabled: false
 {%- endif %}
   salt:
     minion:

diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/haproxy_openstack_api.yml b/mcp/reclass/classes/cluster/mcp-common-noha/haproxy_openstack_api.yml
index 7235071..881d90d 100644 (file)
--- a/mcp/reclass/classes/cluster/mcp-common-noha/haproxy_openstack_api.yml
+++ b/mcp/reclass/classes/cluster/mcp-common-noha/haproxy_openstack_api.yml
@@ -45,17 +45,6 @@ parameters:
               host: ${_param:cluster_node01_address}
               port: 9191
               params: ${_param:haproxy_check}
-        heat_cloudwatch_api:
-          type: openstack-service
-          service_name: heat
-          binds:
-            - address: ${_param:cluster_vip_address}
-              port: 8003
-          servers:
-            - name: ctl01
-              host: ${_param:cluster_node01_address}
-              port: 8003
-              params: ${_param:haproxy_check}
         heat_api:
           type: openstack-service
           service_name: heat
@@ -122,7 +111,7 @@ parameters:
           health-check:
             http:
               options:
-                - expect status 401
+                - expect status 405
           servers:
             - name: ctl01
               host: ${_param:cluster_node01_address}