summaryrefslogtreecommitdiffstats
path: root/mcp
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-06-11 20:25:48 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-06-11 20:58:22 +0200
commit638775bb55e4da535ee4eb66235c0ae81b22ac5d (patch)
tree1ab9763674be877f90e9ffa361f12f59c92d9588 /mcp
parent327cf3fb6a1c5745fa9666d4e2762ee1e4eac853 (diff)
[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 <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'mcp')
-rw-r--r--mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j22
1 files changed, 1 insertions, 1 deletions
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: