Set the name property for all deployment resources

There are two reasons the name property should always be set for deployment
resources:
- The name often shows up in logs, files and API calls, the default
  derived name is long and unhelpful
- Sorting by name determines the merge order of os-apply-config, and the
  execution order of puppet/shell scripts (note this is different to
  resource dependency order) so leaving the default name results in an
  undetermined order which could lead to unpredictable deployment of
  configs

This change simply sets the name to the resource name, but a future change
should prepend each name with a run-parts style 2 digit prefix so that the
order is explicitly stated. Documentation for extraconfig needs to clearly
state what prefix is needed to override which merge/execution order.

For existing overcloud stacks, heat currently replaces deployment resources
when the name changes, so this change
Depends-On: I95037191915ccd32b2efb72203b146897a4edbc9

Change-Id: Ic4bcd56aa65b981275c3d4214588bfc4de63b3b0

9 files changed, 16 insertions, 0 deletions

diff --git a/puppet/extraconfig/all_nodes/neutron-ml2-cisco-nexus-ucsm.yaml b/puppet/extraconfig/all_nodes/neutron-ml2-cisco-nexus-ucsm.yaml
index 2413f5a4..655fd0f2 100644
--- a/puppet/extraconfig/all_nodes/neutron-ml2-cisco-nexus-ucsm.yaml
+++ b/puppet/extraconfig/all_nodes/neutron-ml2-cisco-nexus-ucsm.yaml
@@ -131,6 +131,7 @@ resources:
   NetworkCiscoDeployment:
     type: OS::Heat::StructuredDeployments
     properties:
+      name: NetworkCiscoDeployment
       config: {get_resource: NetworkCiscoConfig}
       servers:  {get_param: controller_servers}
       input_values:
@@ -178,6 +179,7 @@ resources:
   CollectMacDeploymentsController:
     type: OS::Heat::SoftwareDeployments
     properties:
+      name: CollectMacDeploymentsController
       servers:  {get_param: controller_servers}
       config: {get_resource: CollectMacConfig}
       actions: ['CREATE'] # Only do this on CREATE
@@ -185,6 +187,7 @@ resources:
   CollectMacDeploymentsCompute:
     type: OS::Heat::SoftwareDeployments
     properties:
+      name: CollectMacDeploymentsCompute
       servers:  {get_param: compute_servers}
       config: {get_resource: CollectMacConfig}
       actions: ['CREATE'] # Only do this on CREATE
@@ -192,6 +195,7 @@ resources:
   CollectMacDeploymentsBlockStorage:
     type: OS::Heat::SoftwareDeployments
     properties:
+      name: CollectMacDeploymentsBlockStorage
       servers:  {get_param: blockstorage_servers}
       config: {get_resource: CollectMacConfig}
       actions: ['CREATE'] # Only do this on CREATE
@@ -199,6 +203,7 @@ resources:
   CollectMacDeploymentsObjectStorage:
     type: OS::Heat::SoftwareDeployments
     properties:
+      name: CollectMacDeploymentsObjectStorage
       servers:  {get_param: objectstorage_servers}
       config: {get_resource: CollectMacConfig}
       actions: ['CREATE'] # Only do this on CREATE
@@ -206,6 +211,7 @@ resources:
   CollectMacDeploymentsCephStorage:
     type: OS::Heat::SoftwareDeployments
     properties:
+      name: CollectMacDeploymentsCephStorage
       servers:  {get_param: cephstorage_servers}
       config: {get_resource: CollectMacConfig}
       actions: ['CREATE'] # Only do this on CREATE
@@ -280,6 +286,7 @@ resources:
   MappingToNexusDeploymentsController:
     type: OS::Heat::SoftwareDeployment
     properties:
+      name: MappingToNexusDeploymentsController
       server:  {get_param: [controller_servers, '0']}
       config: {get_resource: MappingToNexusConfig}
       input_values:
@@ -323,6 +330,7 @@ resources:
     type: OS::Heat::SoftwareDeployment
     depends_on: MappingToNexusDeploymentsController
     properties:
+      name: MappingToUCSMDeploymentsController
       server:  {get_param: [controller_servers, '0']}
       config: {get_resource: MappingToUCSMConfig}
       input_values:
diff --git a/puppet/extraconfig/pre_deploy/compute/nova-nuage.yaml b/puppet/extraconfig/pre_deploy/compute/nova-nuage.yaml
index 96368e37..5561c74a 100644
--- a/puppet/extraconfig/pre_deploy/compute/nova-nuage.yaml
+++ b/puppet/extraconfig/pre_deploy/compute/nova-nuage.yaml
@@ -70,6 +70,7 @@ resources:
   NovaNuageDeployment:
     type: OS::Heat::StructuredDeployment
     properties:
+      name: NovaNuageDeployment
       config: {get_resource: NovaNuageConfig}
       server: {get_param: server}
       input_values:
diff --git a/puppet/extraconfig/pre_deploy/controller/cinder-netapp.yaml b/puppet/extraconfig/pre_deploy/controller/cinder-netapp.yaml
index 7ec2190f..ab442f2b 100644
--- a/puppet/extraconfig/pre_deploy/controller/cinder-netapp.yaml
+++ b/puppet/extraconfig/pre_deploy/controller/cinder-netapp.yaml
@@ -114,6 +114,7 @@ resources:
   CinderNetappDeployment:
     type: OS::Heat::StructuredDeployment
     properties:
+      name: CinderNetappDeployment
       config: {get_resource: CinderNetappConfig}
       server: {get_param: server}
       input_values:
diff --git a/puppet/extraconfig/pre_deploy/controller/neutron-ml2-bigswitch.yaml b/puppet/extraconfig/pre_deploy/controller/neutron-ml2-bigswitch.yaml
index bf06d25d..1e652960 100644
--- a/puppet/extraconfig/pre_deploy/controller/neutron-ml2-bigswitch.yaml
+++ b/puppet/extraconfig/pre_deploy/controller/neutron-ml2-bigswitch.yaml
@@ -56,6 +56,7 @@ resources:
   NeutronBigswitchDeployment:
     type: OS::Heat::StructuredDeployment
     properties:
+      name: NeutronBigswitchDeployment
       config: {get_resource: NeutronBigswitchConfig}
       server: {get_param: server}
       input_values:
diff --git a/puppet/extraconfig/pre_deploy/controller/neutron-ml2-cisco-n1kv.yaml b/puppet/extraconfig/pre_deploy/controller/neutron-ml2-cisco-n1kv.yaml
index 6730ddf1..cec885cd 100644
--- a/puppet/extraconfig/pre_deploy/controller/neutron-ml2-cisco-n1kv.yaml
+++ b/puppet/extraconfig/pre_deploy/controller/neutron-ml2-cisco-n1kv.yaml
@@ -142,6 +142,7 @@ resources:
   CiscoN1kvDeployment:
     type: OS::Heat::StructuredDeployment
     properties:
+      name: CiscoN1kvDeployment
       config: {get_resource: CiscoN1kvConfig}
       server: {get_param: server}
       input_values:
diff --git a/puppet/extraconfig/pre_deploy/controller/neutron-nuage.yaml b/puppet/extraconfig/pre_deploy/controller/neutron-nuage.yaml
index 8378d2fc..a4cfea07 100644
--- a/puppet/extraconfig/pre_deploy/controller/neutron-nuage.yaml
+++ b/puppet/extraconfig/pre_deploy/controller/neutron-nuage.yaml
@@ -71,6 +71,7 @@ resources:
   NeutronNuageDeployment:
     type: OS::Heat::StructuredDeployment
     properties:
+      name: NeutronNuageDeployment
       config: {get_resource: NeutronNuageConfig}
       server: {get_param: server}
       input_values:
diff --git a/puppet/extraconfig/pre_deploy/per_node.yaml b/puppet/extraconfig/pre_deploy/per_node.yaml
index 80c8ad6e..e236e336 100644
--- a/puppet/extraconfig/pre_deploy/per_node.yaml
+++ b/puppet/extraconfig/pre_deploy/per_node.yaml
@@ -45,6 +45,7 @@ resources:
   NodeSpecificDeployment:
     type: OS::Heat::SoftwareDeployment
     properties:
+      name: NodeSpecificDeployment
       config: {get_resource: NodeSpecificConfig}
       server: {get_param: server}
       input_values:
diff --git a/puppet/extraconfig/tls/ca-inject.yaml b/puppet/extraconfig/tls/ca-inject.yaml
index 7e34f071..5a36e951 100644
--- a/puppet/extraconfig/tls/ca-inject.yaml
+++ b/puppet/extraconfig/tls/ca-inject.yaml
@@ -53,6 +53,7 @@ resources:
   CADeployment:
     type: OS::Heat::SoftwareDeployment
     properties:
+      name: CADeployment
       config: {get_resource: CAConfig}
       server: {get_param: server}
       input_values:
diff --git a/puppet/extraconfig/tls/tls-cert-inject.yaml b/puppet/extraconfig/tls/tls-cert-inject.yaml
index ce524ba9..20bb3737 100644
--- a/puppet/extraconfig/tls/tls-cert-inject.yaml
+++ b/puppet/extraconfig/tls/tls-cert-inject.yaml
@@ -67,6 +67,7 @@ resources:
   ControllerTLSDeployment:
     type: OS::Heat::SoftwareDeployment
     properties:
+      name: ControllerTLSDeployment
       config: {get_resource: ControllerTLSConfig}
       server: {get_param: server}
       input_values: