diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-04-24 18:42:00 +0000 |
|---|---|---|
| committer |   Carlos Camacho <ccamacho@redhat.com> | 2017-05-08 21:17:33 +0200 |
| commit | ffb7ba51e19caba276ee256f7083833e9bcf3b76 (patch) | |
| tree | b3b19c30c38eb9e7719e0c60e3c71cdca57c1f24 /overcloud-resource-registry-puppet.j2.yaml | |
| parent | c224a4c7c9441e9ed0481bdeebcf65fee5d998bc (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.
Change-Id: Ic9d97f172efd2db74255363679b60f1d2dc4e064
Closes-bug: #1669756
(cherry picked from commit 258c6ce52d0c8467f34693722a883d96345802b2)
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 |