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 --- extraconfig/tasks/post_puppet_pacemaker.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'extraconfig') diff --git a/extraconfig/tasks/post_puppet_pacemaker.yaml b/extraconfig/tasks/post_puppet_pacemaker.yaml index a63868c9..a304e55b 100644 --- a/extraconfig/tasks/post_puppet_pacemaker.yaml +++ b/extraconfig/tasks/post_puppet_pacemaker.yaml @@ -25,7 +25,7 @@ resources: ControllerPostPuppetMaintenanceModeDeployment: type: OS::Heat::SoftwareDeployments properties: - servers: {get_param: servers} + servers: {get_param: servers} config: {get_resource: ControllerPostPuppetMaintenanceModeConfig} input_values: {get_param: input_values} @@ -33,5 +33,5 @@ resources: type: OS::TripleO::Tasks::ControllerPostPuppetRestart depends_on: ControllerPostPuppetMaintenanceModeDeployment properties: - servers: {get_param: servers} + servers: {get_param: servers} input_values: {get_param: input_values} -- cgit 1.2.3-korg