diff options
author | Jenkins <jenkins@review.openstack.org> | 2015-10-09 08:56:59 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2015-10-09 08:56:59 +0000 |
commit | 2657c78dc44684b6e881fa0598897a4f1bce5b6c (patch) | |
tree | 1d74413bdf7ad030a5344f2324490bdc9641b03b /overcloud-resource-registry-puppet.yaml | |
parent | 15b081fd78f9212158622d3460ac1e9a57e27219 (diff) | |
parent | 1b70744623eb9b65a762aed9ce67c74dcd054cd3 (diff) |
Merge "Wire in NodeExtraConfig interface"
Diffstat (limited to 'overcloud-resource-registry-puppet.yaml')
-rw-r--r-- | overcloud-resource-registry-puppet.yaml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/overcloud-resource-registry-puppet.yaml b/overcloud-resource-registry-puppet.yaml index b527c10f..7e65d4b1 100644 --- a/overcloud-resource-registry-puppet.yaml +++ b/overcloud-resource-registry-puppet.yaml @@ -30,11 +30,13 @@ resource_registry: # Hooks for operator extra config # NodeUserData == Cloud-init additional user-data, e.g cloud-config # ControllerExtraConfigPre == Controller configuration pre service deployment + # NodeExtraConfig == All nodes configuration pre service deployment # NodeExtraConfigPost == All nodes configuration post service deployment OS::TripleO::NodeUserData: firstboot/userdata_default.yaml OS::TripleO::ControllerExtraConfigPre: puppet/extraconfig/pre_deploy/default.yaml OS::TripleO::ComputeExtraConfigPre: puppet/extraconfig/pre_deploy/default.yaml OS::TripleO::CephStorageExtraConfigPre: puppet/extraconfig/pre_deploy/default.yaml + OS::TripleO::NodeExtraConfig: puppet/extraconfig/pre_deploy/default.yaml OS::TripleO::NodeExtraConfigPost: extraconfig/post_deploy/default.yaml # "AllNodes" Extra cluster config, runs on all nodes prior to the post_deploy |