From: Emilien Macchi <emilien@redhat.com>
Date: Mon, 9 May 2016 19:13:54 +0000 (-0400)
Subject: deployment: remove Step7
X-Git-Tag: opnfv-6.0.0~2008
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;ds=sidebyside;h=ff7c5c72ed6aa57bfa8e1e15a446211717c32dc6;hp=d76f70edcd3bbf0308071638cb4ee8eb2f70503a;p=apex-tripleo-heat-templates.git

deployment: remove Step7

Step7 was created when we incremented the step of ringbuilder, by
https://review.openstack.org/#q,9988bd25aa4bac1375ef4783d636c7adecedee92,n,z

But step7 is not used anywhere and consumes some times for nothing.
This patch removes the step, so deployments and upgrades will be faster.

Change-Id: I77af9126abc61ace227cf1a69c2d3b5ceb735276
---

diff --git a/puppet/controller-post.yaml b/puppet/controller-post.yaml
index 80b08a06..d89abdc7 100644
--- a/puppet/controller-post.yaml
+++ b/puppet/controller-post.yaml
@@ -113,20 +113,9 @@ resources:
         step: 6
         update_identifier: {get_param: NodeConfigIdentifiers}
 
-  ControllerOvercloudServicesDeployment_Step7:
-    type: OS::Heat::StructuredDeployments
-    depends_on: ControllerOvercloudServicesDeployment_Step6
-    properties:
-      name: ControllerOvercloudServicesDeployment_Step7
-      servers:  {get_param: servers}
-      config: {get_resource: ControllerPuppetConfig}
-      input_values:
-        step: 7
-        update_identifier: {get_param: NodeConfigIdentifiers}
-
   ControllerPostPuppet:
     type: OS::TripleO::Tasks::ControllerPostPuppet
-    depends_on: ControllerOvercloudServicesDeployment_Step7
+    depends_on: ControllerOvercloudServicesDeployment_Step6
     properties:
       servers:  {get_param: servers}
       input_values: