From 258c6ce52d0c8467f34693722a883d96345802b2 Mon Sep 17 00:00:00 2001 From: Carlos Camacho Date: Mon, 3 Apr 2017 14:24:06 +0200 Subject: Merge pre|post puppet resources into pre|post config. The [Pre|Post]Puppet resources were renamed in https://review.openstack.org/#/c/365763. This was intended for having a pre/post deployment steps using an agnostic name instead of being attached to a technology. The renaming was unintentionally reverted in https://review.openstack.org/#/c/393644/ and https://review.openstack.org/#/c/434451. This submission merge both resources into one, and remove the old pre|post hooks. Closes-bug: #1669756 Change-Id: Ic9d97f172efd2db74255363679b60f1d2dc4e064 --- docker/docker-steps.j2 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'docker/docker-steps.j2') diff --git a/docker/docker-steps.j2 b/docker/docker-steps.j2 index 643727db..d41b1056 100644 --- a/docker/docker-steps.j2 +++ b/docker/docker-steps.j2 @@ -257,8 +257,8 @@ resources: # BEGIN BAREMETAL CONFIG STEPS {% if role.name == 'Controller' %} - ControllerPrePuppet: - type: OS::TripleO::Tasks::ControllerPrePuppet + ControllerPreConfig: + type: OS::TripleO::Tasks::ControllerPreConfig properties: servers: {get_param: [servers, Controller]} input_values: @@ -354,10 +354,10 @@ resources: servers: {get_param: [servers, {{role.name}}]} {% if role.name == 'Controller' %} - ControllerPostPuppet: + ControllerPostConfig: depends_on: - ControllerExtraConfigPost - type: OS::TripleO::Tasks::ControllerPostPuppet + type: OS::TripleO::Tasks::ControllerPostConfig properties: servers: {get_param: [servers, Controller]} input_values: -- cgit 1.2.3-korg