diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-11-09 18:10:34 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-11-09 18:10:35 +0000 |
| commit | 1efaa8c6a2351c35fdb5e18544a5c4dd3cee8c4f (patch) | |
| tree | 1b5206a1261bad6aee414058b26406043317be0f /overcloud-resource-registry-puppet.j2.yaml | |
| parent | f754c57ee15968b88598c1019c7ef046b5307f9c (diff) | |
| parent | 17e727d716ac0346fab457886d8e2bc7355b3a3f (diff) | |
Merge "Reload haproxy configuration as a post-deployment step"
Diffstat (limited to 'overcloud-resource-registry-puppet.j2.yaml')
| -rw-r--r-- | overcloud-resource-registry-puppet.j2.yaml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml index f06f51e0..d6f1ff7d 100644 --- a/overcloud-resource-registry-puppet.j2.yaml +++ b/overcloud-resource-registry-puppet.j2.yaml @@ -57,6 +57,9 @@ 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 + # "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 |