diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2015-12-15 13:26:50 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2015-12-15 13:26:50 +0000 |
| commit | 0df1c1589877ffd57b6ef933060f6d3316c9d343 (patch) | |
| tree | ee605e31177c69cde7aca90db5859e6483665327 /overcloud-resource-registry-puppet.yaml | |
| parent | 3e8010dc8506755f193d6e0f84006452b4eaeee5 (diff) | |
| parent | ea1294fe9b11029edab719e8bf558733226b3fd4 (diff) | |
Merge "Pacemaker maintenance mode for the duration of Puppet run on update"
Diffstat (limited to 'overcloud-resource-registry-puppet.yaml')
| -rw-r--r-- | overcloud-resource-registry-puppet.yaml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/overcloud-resource-registry-puppet.yaml b/overcloud-resource-registry-puppet.yaml index c072c292..77368d0a 100644 --- a/overcloud-resource-registry-puppet.yaml +++ b/overcloud-resource-registry-puppet.yaml @@ -21,7 +21,11 @@ resource_registry: OS::TripleO::CephClusterConfig::SoftwareConfig: puppet/ceph-cluster-config.yaml OS::TripleO::AllNodes::SoftwareConfig: puppet/all-nodes-config.yaml OS::TripleO::BootstrapNode::SoftwareConfig: puppet/bootstrap-config.yaml + + # Tasks (for internal TripleO usage) OS::TripleO::Tasks::PackageUpdate: extraconfig/tasks/yum_update.yaml + OS::TripleO::Tasks::ControllerPrePuppet: extraconfig/tasks/noop.yaml + OS::TripleO::Tasks::ControllerPostPuppet: extraconfig/tasks/noop.yaml # This creates the "heat-admin" user for all OS images by default # To disable, replace with firstboot/userdata_default.yaml |