Merge "Set the name property for all deployment resources"

diff --cc docker/compute-post.yaml
index 8f786f7,3cca36d..82572e7
--- 1/docker/compute-post.yaml
--- 2/docker/compute-post.yaml
+++ b/docker/compute-post.yaml
@@@ -162,13 -84,9 +164,14 @@@ resources
      type: OS::Heat::SoftwareDeployments
      depends_on: CopyEtcDeployment
      properties:
+       name: CopyJsonDeployment
        config: {get_resource: CopyJsonConfig}
        servers:  {get_param: servers}
 +      input_values:
 +        libvirt_config: {get_param: LibvirtConfig}
 +        nova_config: {get_param: NovaConfig}
 +        neutron_openvswitch_agent_config: {get_param: NeutronOpenvswitchAgentConfig}
 +        neutron_agent_config: {get_param: NeutronAgentConfig}
  
    NovaComputeContainersDeploymentOVS:
      type: OS::Heat::StructuredDeployments

diff --cc overcloud.yaml
Simple merge

diff --cc puppet/ceph-storage.yaml
Simple merge

diff --cc puppet/cinder-storage-post.yaml
index bb7f94d,731ffe1..9b7c752
--- 1/puppet/cinder-storage-post.yaml
--- 2/puppet/cinder-storage-post.yaml
+++ b/puppet/cinder-storage-post.yaml
@@@ -28,13 -28,6 +28,14 @@@ resources
    VolumeDeployment_Step1:
      type: OS::Heat::StructuredDeployments
      properties:
+       name: VolumeDeployment_Step1
        servers:  {get_param: servers}
        config: {get_resource: VolumePuppetConfig}
 +
 +  # Note, this should come last, so use depends_on to ensure
 +  # this is created after any other resources.
 +  ExtraConfig:
 +    depends_on: VolumeDeployment_Step1
 +    type: OS::TripleO::NodeExtraConfigPost
 +    properties:
 +        servers: {get_param: servers}

diff --cc puppet/cinder-storage.yaml
Simple merge

diff --cc puppet/compute.yaml
Simple merge

diff --cc puppet/controller-post.yaml
index ed8129e,bfb69a1..d250dd7
--- 1/puppet/controller-post.yaml
--- 2/puppet/controller-post.yaml
+++ b/puppet/controller-post.yaml
@@@ -33,8 -26,8 +33,9 @@@ resources
    # e.g all Deployment resources should have a *Deployment_StepN suffix
    ControllerLoadBalancerDeployment_Step1:
      type: OS::Heat::StructuredDeployments
 +    depends_on: ControllerPrePuppet
      properties:
+       name: ControllerLoadBalancerDeployment_Step1
        servers:  {get_param: servers}
        config: {get_resource: ControllerPuppetConfig}
        input_values:

diff --cc puppet/controller.yaml
Simple merge

diff --cc puppet/swift-storage.yaml
Simple merge