diff options
author | Jenkins <jenkins@review.openstack.org> | 2015-07-08 13:04:09 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2015-07-08 13:04:09 +0000 |
commit | 82f04ec310fe9d4f99e46077bb1c6e439187c7ed (patch) | |
tree | bc157391ff8d3fbc5a6c3de5bf66fcbeedea0242 /overcloud-resource-registry-puppet.yaml | |
parent | fa782c157cc0ce997e1957412e8f55b018519df7 (diff) | |
parent | e4c4c4068e817e30f46ba9ed475790f20343df18 (diff) |
Merge "Wire in Controller pre-deployment extraconfig"
Diffstat (limited to 'overcloud-resource-registry-puppet.yaml')
-rw-r--r-- | overcloud-resource-registry-puppet.yaml | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/overcloud-resource-registry-puppet.yaml b/overcloud-resource-registry-puppet.yaml index c9041c6b..17c1470f 100644 --- a/overcloud-resource-registry-puppet.yaml +++ b/overcloud-resource-registry-puppet.yaml @@ -21,9 +21,15 @@ 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 + OS::TripleO::Tasks::PackageUpdate: extraconfig/tasks/yum_update.yaml + + # Hooks for operator extra config + # NodeUserData == Cloud-init additional user-data, e.g cloud-config + # ControllerExtraConfigPre == Controller 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::NodeExtraConfigPost: extraconfig/post_deploy/default.yaml - OS::TripleO::Tasks::PackageUpdate: extraconfig/tasks/yum_update.yaml # TripleO overcloud networks OS::TripleO::Network: network/networks.yaml @@ -65,9 +71,6 @@ resource_registry: OS::TripleO::BlockStorage::Ports::StoragePort: network/ports/noop.yaml OS::TripleO::BlockStorage::Ports::StorageMgmtPort: network/ports/noop.yaml - # Cinder backend config for the controller role - OS::TripleO::Controller::CinderBackend: extraconfig/controller/noop.yaml - # Port assignments for service virtual IPs for the controller role OS::TripleO::Controller::Ports::RedisVipPort: network/ports/ctlplane_vip.yaml |