summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-06-12 13:58:07 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-06-12 13:58:07 +0000
commit60cd82b0e2af9c8f34a97eacd4cee0893684e6ae (patch)
tree59e8d664b5212509b276bc73e7e9ad23132acfd3
parent0f4795273910ebdccbcbc602bd749093bcd51e9b (diff)
parent638775bb55e4da535ee4eb66235c0ae81b22ac5d (diff)
Merge "[ha] Fix salt state apply on ctl VCP nodes"
-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: