diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-04-24 18:42:00 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-04-24 18:42:00 +0000 |
| commit | b364c5eb9dab93e3fb5f3bb329ee27bca32e985c (patch) | |
| tree | d2bdc7701bfa0b97496f35f290dbdc476d48fe4e /docker | |
| parent | 3042ee8b30132c76a81c41c273c8e0c9653b6662 (diff) | |
| parent | 258c6ce52d0c8467f34693722a883d96345802b2 (diff) | |
Merge "Merge pre|post puppet resources into pre|post config."
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/docker-steps.j2 | 8 |
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: |