From 2c77ae5cc40df831e6cfa996ac192b7b4f7b24b3 Mon Sep 17 00:00:00 2001 From: Michael Polenchuk Date: Sat, 9 Jun 2018 18:22:04 +0400 Subject: 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 --- mcp/reclass/classes/cluster/mcp-common-ha/openstack_proxy.yml.j2 | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to '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 34ec10664..5ddb9860a 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 @@ -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: -- cgit 1.2.3-korg