diff options
| -rw-r--r-- | compute-post.yaml | 8 | ||||
| -rw-r--r-- | overcloud-resource-registry-puppet.yaml | 1 | ||||
| -rw-r--r-- | overcloud-resource-registry.yaml | 1 | ||||
| -rw-r--r-- | overcloud-without-mergepy.yaml | 6 | ||||
| -rw-r--r-- | puppet/compute-post-puppet.yaml | 25 | ||||
| -rw-r--r-- | puppet/compute-puppet.yaml | 15 |
6 files changed, 41 insertions, 15 deletions
diff --git a/compute-post.yaml b/compute-post.yaml new file mode 100644 index 00000000..8c49709f --- /dev/null +++ b/compute-post.yaml @@ -0,0 +1,8 @@ +heat_template_version: 2014-10-16 +description: 'Compute Post Deployment' +# NOTE: this is a noop for os-apply-config style deployments because +# post deployment ordering is controlled by tripleo-image-elements + +parameters: + servers: + type: json diff --git a/overcloud-resource-registry-puppet.yaml b/overcloud-resource-registry-puppet.yaml index b487f425..eeef6d1c 100644 --- a/overcloud-resource-registry-puppet.yaml +++ b/overcloud-resource-registry-puppet.yaml @@ -7,6 +7,7 @@ resource_registry: OS::TripleO::Net::SoftwareConfig: net-config-bridge.yaml OS::TripleO::CephStorage: puppet/ceph-storage-puppet.yaml OS::TripleO::ControllerPostDeployment: puppet/controller-post-puppet.yaml + OS::TripleO::ComputePostDeployment: puppet/compute-post-puppet.yaml OS::TripleO::SwiftDevicesAndProxy::SoftwareConfig: puppet/swift-devices-and-proxy-config.yaml OS::TripleO::AllNodes::SoftwareConfig: puppet/all-nodes-config.yaml OS::TripleO::BootstrapNode::SoftwareConfig: puppet/bootstrap-config.yaml diff --git a/overcloud-resource-registry.yaml b/overcloud-resource-registry.yaml index 32e3ad4a..9d0f653e 100644 --- a/overcloud-resource-registry.yaml +++ b/overcloud-resource-registry.yaml @@ -7,6 +7,7 @@ resource_registry: OS::TripleO::Net::SoftwareConfig: net-config-noop.yaml OS::TripleO::CephStorage: ceph-storage.yaml OS::TripleO::ControllerPostDeployment: controller-post.yaml + OS::TripleO::ComputePostDeployment: compute-post.yaml OS::TripleO::SwiftDevicesAndProxy::SoftwareConfig: swift-devices-and-proxy-config.yaml OS::TripleO::AllNodes::SoftwareConfig: all-nodes-config.yaml OS::TripleO::BootstrapNode::SoftwareConfig: bootstrap-config.yaml diff --git a/overcloud-without-mergepy.yaml b/overcloud-without-mergepy.yaml index bd48ec66..3a719e3c 100644 --- a/overcloud-without-mergepy.yaml +++ b/overcloud-without-mergepy.yaml @@ -784,6 +784,12 @@ resources: properties: servers: {get_attr: [Controller, attributes, nova_server_resource]} + ComputeNodesPostDeployment: + type: OS::TripleO::ComputePostDeployment + depends_on: ComputeAllNodesDeployment + properties: + servers: {get_attr: [Compute, attributes, nova_server_resource]} + outputs: KeystoneURL: description: URL for the Overcloud Keystone service diff --git a/puppet/compute-post-puppet.yaml b/puppet/compute-post-puppet.yaml new file mode 100644 index 00000000..9b7eb0cf --- /dev/null +++ b/puppet/compute-post-puppet.yaml @@ -0,0 +1,25 @@ +heat_template_version: 2014-10-16 + +description: > + OpenStack compute node post deployment for Puppet. + +parameters: + servers: + type: json + +resources: + + ComputePuppetConfig: + type: OS::Heat::SoftwareConfig + properties: + group: puppet + outputs: + - name: result + config: + get_file: manifests/overcloud_compute.pp + + ComputePuppetDeployment: + type: OS::Heat::StructuredDeployments + properties: + servers: {get_param: servers} + config: {get_resource: ComputePuppetConfig} diff --git a/puppet/compute-puppet.yaml b/puppet/compute-puppet.yaml index ab2d0a32..e6b5a78b 100644 --- a/puppet/compute-puppet.yaml +++ b/puppet/compute-puppet.yaml @@ -260,21 +260,6 @@ resources: bridge_name: {get_param: NeutronPhysicalBridge} interface_name: {get_param: NeutronPublicInterface} - ComputePuppetConfig: - type: OS::Heat::SoftwareConfig - properties: - group: puppet - outputs: - - name: result - config: - get_file: manifests/overcloud_compute.pp - - ComputePuppetDeployment: - type: OS::Heat::StructuredDeployment - properties: - server: {get_resource: NovaCompute} - config: {get_resource: ComputePuppetConfig} - NovaComputeConfig: type: OS::Heat::StructuredConfig properties: |