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 /overcloud-resource-registry-puppet.j2.yaml | |
parent | 3042ee8b30132c76a81c41c273c8e0c9653b6662 (diff) | |
parent | 258c6ce52d0c8467f34693722a883d96345802b2 (diff) |
Merge "Merge pre|post puppet resources into pre|post config."
Diffstat (limited to 'overcloud-resource-registry-puppet.j2.yaml')
-rw-r--r-- | overcloud-resource-registry-puppet.j2.yaml | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml index dd0cec76..9d6c265e 100644 --- a/overcloud-resource-registry-puppet.j2.yaml +++ b/overcloud-resource-registry-puppet.j2.yaml @@ -65,11 +65,6 @@ resource_registry: OS::TripleO::NodeExtraConfig: puppet/extraconfig/pre_deploy/default.yaml OS::TripleO::NodeExtraConfigPost: extraconfig/post_deploy/default.yaml -{% 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 # configuration with knowledge of all nodes in the cluster is required vs single |