From: Alexandru Avadanii Date: Mon, 11 Jun 2018 18:25:48 +0000 (+0200) Subject: [ha] Fix salt state apply on ctl VCP nodes X-Git-Tag: opnfv-7.0.0~171^2 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=638775bb55e4da535ee4eb66235c0ae81b22ac5d;hp=327cf3fb6a1c5745fa9666d4e2762ee1e4eac853;p=fuel.git [ha] Fix salt state apply on ctl VCP nodes Sphinx metadata collection does not check whether a haproxy server is enabled or not, so keep full 'heat_cloudwatch_api' configuration in place to prevent breakage; and just disable it instead. Change-Id: I9fda1f3d2829b89ea8e425ae831a54484651f60a Signed-off-by: Alexandru Avadanii --- 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 cdebe3fb3..52f5f9101 100644 --- a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2 @@ -139,7 +139,7 @@ parameters: http: ~options: - expect status 405 - ~heat_cloudwatch_api: + heat_cloudwatch_api: enabled: false bind: server: