diff options
author | Jenkins <jenkins@review.openstack.org> | 2017-05-12 03:06:32 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2017-05-12 03:06:32 +0000 |
commit | bdc175be26655580004af41b1fd2cfe612ebf953 (patch) | |
tree | 6eeef0ef558f7a4888480082518e049d34a832b5 /overcloud-resource-registry-puppet.j2.yaml | |
parent | 43b33c7ed8ae2b02dc552767eaa7eb1dec4fb2e1 (diff) | |
parent | ffb7ba51e19caba276ee256f7083833e9bcf3b76 (diff) |
Merge "Merge pre|post puppet resources into pre|post config." into stable/ocata
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 55bc2ece..b4c984eb 100644 --- a/overcloud-resource-registry-puppet.j2.yaml +++ b/overcloud-resource-registry-puppet.j2.yaml @@ -68,11 +68,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 |