From: Jenkins <jenkins@review.openstack.org>
Date: Mon, 18 Jan 2016 23:16:15 +0000 (+0000)
Subject: Merge "Set the name property for all deployment resources"
X-Git-Tag: opnfv-6.0.0~2221
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=795e4290dd6b12a8f4b7c6932a3777a036195081;p=apex-tripleo-heat-templates.git

Merge "Set the name property for all deployment resources"
---

795e4290dd6b12a8f4b7c6932a3777a036195081
diff --cc docker/compute-post.yaml
index 8f786f72,3cca36d8..82572e77
--- a/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 puppet/cinder-storage-post.yaml
index bb7f94de,731ffe1c..9b7c752a
--- a/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/controller-post.yaml
index ed8129e7,bfb69a15..d250dd70
--- a/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: