diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-02-20 23:48:52 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-02-20 23:48:52 +0000 |
| commit | c94e09eeac08e537c1a68850ff77f37c1eb43bda (patch) | |
| tree | bb4aef3882e48fa6563fd5c62940c7bd57c37eaa /overcloud-resource-registry-puppet.j2.yaml | |
| parent | 435d2709860bf7044be860354d7d31cf6d43af6c (diff) | |
| parent | 529768ae84f7713f2ae9447ff35ee2d63b4bdcd7 (diff) | |
Merge "Generate Pre/Post Puppet Tasks for all roles"
Diffstat (limited to 'overcloud-resource-registry-puppet.j2.yaml')
| -rw-r--r-- | overcloud-resource-registry-puppet.j2.yaml | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml index df94a3fe..8c780cb7 100644 --- a/overcloud-resource-registry-puppet.j2.yaml +++ b/overcloud-resource-registry-puppet.j2.yaml @@ -69,8 +69,10 @@ resource_registry: OS::TripleO::NodeExtraConfig: puppet/extraconfig/pre_deploy/default.yaml OS::TripleO::NodeExtraConfigPost: extraconfig/post_deploy/default.yaml - OS::TripleO::Tasks::ControllerPrePuppet: OS::Heat::None - OS::TripleO::Tasks::ControllerPostPuppet: OS::Heat::None +{% for role in roles %} + OS::TripleO::Tasks::{{role.name}}PrePuppet: OS::Heat::None + OS::TripleO::Tasks::{{role.name}}PostPuppet: OS::Heat::None +{% endfor %} # "AllNodes" Extra cluster config, runs on all nodes prior to the post_deploy # phase, e.g when puppet is applied, but after the pre_deploy phase. Useful when |