summaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorCarlos Camacho <ccamacho@redhat.com>2017-04-03 14:24:06 +0200
committerCarlos Camacho <ccamacho@redhat.com>2017-04-24 12:56:49 +0200
commit258c6ce52d0c8467f34693722a883d96345802b2 (patch)
tree327137d50e6657a95c429d13dd222714fdfe86f7 /docker
parent085d5009b6b56245b46ecb935a72d86402791c89 (diff)
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
Diffstat (limited to 'docker')
-rw-r--r--docker/docker-steps.j28
1 files changed, 4 insertions, 4 deletions
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: