Code Review / apex-tripleo-heat-templates.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw (from parent 1: 69545a0)
Merge "Do not set cluster in maintenance mode during split stack upgrade" into stable...
authorZuul <zuul@review.openstack.org>
Thu, 9 Nov 2017 08:25:43 +0000 (08:25 +0000)
committerGerrit Code Review <review@openstack.org>
Thu, 9 Nov 2017 08:25:43 +0000 (08:25 +0000)
environments/deployed-server-pacemaker-environment.yaml patch | blob | history

diff --git a/environments/deployed-server-pacemaker-environment.yaml b/environments/deployed-server-pacemaker-environment.yaml
index cc9ea99..83d81bb 100644 (file)
--- a/environments/deployed-server-pacemaker-environment.yaml
+++ b/environments/deployed-server-pacemaker-environment.yaml
@@ -1,4 +1,4 @@
 resource_registry:
-  OS::TripleO::Tasks::ControllerDeployedServerPreConfig: ../extraconfig/tasks/pre_puppet_pacemaker.yaml
-  OS::TripleO::Tasks::ControllerDeployedServerPostConfig: ../extraconfig/tasks/post_puppet_pacemaker.yaml
+  OS::TripleO::Tasks::ControllerDeployedServerPreConfig: OS::Heat::None
+  OS::TripleO::Tasks::ControllerDeployedServerPostConfig: OS::Heat::None
   OS::TripleO::Tasks::ControllerDeployedServerPostPuppetRestart: ../extraconfig/tasks/post_puppet_pacemaker_restart.yaml