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 /puppet | |
| parent | 15b081fd78f9212158622d3460ac1e9a57e27219 (diff) | |
| parent | 1b70744623eb9b65a762aed9ce67c74dcd054cd3 (diff) | |
Merge "Wire in NodeExtraConfig interface"
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/ceph-storage.yaml | 8 | ||||
| -rw-r--r-- | puppet/cinder-storage.yaml | 8 | ||||
| -rw-r--r-- | puppet/compute.yaml | 8 | ||||
| -rw-r--r-- | puppet/controller.yaml | 8 | ||||
| -rw-r--r-- | puppet/swift-storage.yaml | 8 |
5 files changed, 40 insertions, 0 deletions
diff --git a/puppet/ceph-storage.yaml b/puppet/ceph-storage.yaml index 1213d3df..75294599 100644 --- a/puppet/ceph-storage.yaml +++ b/puppet/ceph-storage.yaml @@ -181,6 +181,14 @@ resources: properties: server: {get_resource: CephStorage} + # Hook for site-specific additional pre-deployment config, + # applying to all nodes, e.g node registration/unregistration + NodeExtraConfig: + depends_on: CephStorageExtraConfigPre + type: OS::TripleO::NodeExtraConfig + properties: + server: {get_resource: CephStorage} + UpdateConfig: type: OS::TripleO::Tasks::PackageUpdate diff --git a/puppet/cinder-storage.yaml b/puppet/cinder-storage.yaml index 5779c097..972523ae 100644 --- a/puppet/cinder-storage.yaml +++ b/puppet/cinder-storage.yaml @@ -263,6 +263,14 @@ resources: snmpd_readonly_user_name: {get_input: snmpd_readonly_user_name} snmpd_readonly_user_password: {get_input: snmpd_readonly_user_password} + # Hook for site-specific additional pre-deployment config, + # applying to all nodes, e.g node registration/unregistration + NodeExtraConfig: + depends_on: BlockStorageDeployment + type: OS::TripleO::NodeExtraConfig + properties: + server: {get_resource: BlockStorage} + UpdateConfig: type: OS::TripleO::Tasks::PackageUpdate diff --git a/puppet/compute.yaml b/puppet/compute.yaml index 9ddc89c7..bdee93dd 100644 --- a/puppet/compute.yaml +++ b/puppet/compute.yaml @@ -555,6 +555,14 @@ resources: properties: server: {get_resource: NovaCompute} + # Hook for site-specific additional pre-deployment config, + # applying to all nodes, e.g node registration/unregistration + NodeExtraConfig: + depends_on: ComputeExtraConfigPre + type: OS::TripleO::NodeExtraConfig + properties: + server: {get_resource: NovaCompute} + UpdateConfig: type: OS::TripleO::Tasks::PackageUpdate diff --git a/puppet/controller.yaml b/puppet/controller.yaml index da98010b..3b7ec7e7 100644 --- a/puppet/controller.yaml +++ b/puppet/controller.yaml @@ -1211,6 +1211,14 @@ resources: properties: server: {get_resource: Controller} + # Hook for site-specific additional pre-deployment config, + # applying to all nodes, e.g node registration/unregistration + NodeExtraConfig: + depends_on: ControllerExtraConfigPre + type: OS::TripleO::NodeExtraConfig + properties: + server: {get_resource: Controller} + UpdateConfig: type: OS::TripleO::Tasks::PackageUpdate diff --git a/puppet/swift-storage.yaml b/puppet/swift-storage.yaml index f6623be6..22ec6096 100644 --- a/puppet/swift-storage.yaml +++ b/puppet/swift-storage.yaml @@ -216,6 +216,14 @@ resources: enable_package_upgrade: {get_attr: [UpdateDeployment, update_managed_packages]} swift_management_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, SwiftMgmtNetwork]}]} + # Hook for site-specific additional pre-deployment config, + # applying to all nodes, e.g node registration/unregistration + NodeExtraConfig: + depends_on: SwiftStorageHieraDeploy + type: OS::TripleO::NodeExtraConfig + properties: + server: {get_resource: SwiftStorage} + UpdateConfig: type: OS::TripleO::Tasks::PackageUpdate |