aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/controller-post.yaml
diff options
context:
space:
mode:
authorEmilien Macchi <emilien@redhat.com>2016-05-09 15:39:47 -0400
committerEmilien Macchi <emilien@redhat.com>2016-05-10 22:12:51 +0000
commitc2cd6f01dc18901a33bd04ffe71ef00613fc3744 (patch)
tree43a1f92c331c312e26b03f315ceff0f936cce01d /puppet/controller-post.yaml
parentff7c5c72ed6aa57bfa8e1e15a446211717c32dc6 (diff)
deployment: drop step6
Step6 was just about confuring fencing after creating all Pacemaker resources. It was created by this patch: https://review.openstack.org/#q,1787fbc7ca58f9965cd5d64b685c1f9beed4cb9b,n,z A bit of Puppet orchestration can help us to not require an extra step. This patch: * configure & enable fencing at step5 * make sure we don't configure fencing because creating Pacemaker resources and constraints. * remove step6 from deployment workflow. * depends on a patch in puppet-tripleo that moves keystone resources (endpoints, roles) to step 5. Change-Id: Iae33149e4a03cd64c5831e689be8189ad0cf034b Depends-On: Icea7537cea330da59fe108c9b874c04f2b94d062 Depends-On: I079e65f535af069312b602e8ff58be80ab2f2226
Diffstat (limited to 'puppet/controller-post.yaml')
-rw-r--r--puppet/controller-post.yaml13
1 files changed, 1 insertions, 12 deletions
diff --git a/puppet/controller-post.yaml b/puppet/controller-post.yaml
index d89abdc..705e4b9 100644
--- a/puppet/controller-post.yaml
+++ b/puppet/controller-post.yaml
@@ -102,20 +102,9 @@ resources:
step: 5
update_identifier: {get_param: NodeConfigIdentifiers}
- ControllerOvercloudServicesDeployment_Step6:
- type: OS::Heat::StructuredDeployments
- depends_on: ControllerOvercloudServicesDeployment_Step5
- properties:
- name: ControllerOvercloudServicesDeployment_Step6
- servers: {get_param: servers}
- config: {get_resource: ControllerPuppetConfig}
- input_values:
- step: 6
- update_identifier: {get_param: NodeConfigIdentifiers}
-
ControllerPostPuppet:
type: OS::TripleO::Tasks::ControllerPostPuppet
- depends_on: ControllerOvercloudServicesDeployment_Step6
+ depends_on: ControllerOvercloudServicesDeployment_Step5
properties:
servers: {get_param: servers}
input_values: