From c1a4f8d810c4c472196ee17d28c449ef40ed91e8 Mon Sep 17 00:00:00 2001
From: James Slagle <jslagle@redhat.com>
Date: Mon, 17 Jul 2017 12:00:35 -0400
Subject: Set name property on missing deployments

To be consistent with all other SoftwareDeployment's in
tripleo-heat-templates, this sets the name property on
the deployments where it was missing.

Change-Id: I8bc062d2af93acead240bd5e473ea385b2bf6cf2
---
 deployed-server/deployed-server-bootstrap-centos.yaml | 1 +
 deployed-server/deployed-server-bootstrap-rhel.yaml   | 1 +
 extraconfig/tasks/post_puppet_pacemaker.j2.yaml       | 1 +
 extraconfig/tasks/post_puppet_pacemaker_restart.yaml  | 1 +
 extraconfig/tasks/ssh/host_public_key.yaml            | 1 +
 puppet/puppet-steps.j2                                | 1 +
 6 files changed, 6 insertions(+)

diff --git a/deployed-server/deployed-server-bootstrap-centos.yaml b/deployed-server/deployed-server-bootstrap-centos.yaml
index 5b268234..d57ea9fc 100644
--- a/deployed-server/deployed-server-bootstrap-centos.yaml
+++ b/deployed-server/deployed-server-bootstrap-centos.yaml
@@ -18,5 +18,6 @@ resources:
   DeployedServerBootstrapDeployment:
     type: OS::Heat::SoftwareDeployment
     properties:
+      name: DeployedServerBootstrapDeployment
       config: {get_resource: DeployedServerBootstrapConfig}
       server: {get_param: server}
diff --git a/deployed-server/deployed-server-bootstrap-rhel.yaml b/deployed-server/deployed-server-bootstrap-rhel.yaml
index a9018515..554bff3e 100644
--- a/deployed-server/deployed-server-bootstrap-rhel.yaml
+++ b/deployed-server/deployed-server-bootstrap-rhel.yaml
@@ -18,5 +18,6 @@ resources:
   DeployedServerBootstrapDeployment:
     type: OS::Heat::SoftwareDeployment
     properties:
+      name: DeployedServerBootstrapDeployment
       config: {get_resource: DeployedServerBootstrapConfig}
       server: {get_param: server}
diff --git a/extraconfig/tasks/post_puppet_pacemaker.j2.yaml b/extraconfig/tasks/post_puppet_pacemaker.j2.yaml
index 6bf5afb0..4d34aedf 100644
--- a/extraconfig/tasks/post_puppet_pacemaker.j2.yaml
+++ b/extraconfig/tasks/post_puppet_pacemaker.j2.yaml
@@ -27,6 +27,7 @@ resources:
   {{role.name}}PostPuppetMaintenanceModeDeployment:
     type: OS::Heat::SoftwareDeployments
     properties:
+      name: {{role.name}}PostPuppetMaintenanceModeDeployment
       servers: {get_param: [servers, {{role.name}}]}
       config: {get_resource: {{role.name}}PostPuppetMaintenanceModeConfig}
       input_values: {get_param: input_values}
diff --git a/extraconfig/tasks/post_puppet_pacemaker_restart.yaml b/extraconfig/tasks/post_puppet_pacemaker_restart.yaml
index 203ca1f8..102be8a8 100644
--- a/extraconfig/tasks/post_puppet_pacemaker_restart.yaml
+++ b/extraconfig/tasks/post_puppet_pacemaker_restart.yaml
@@ -23,6 +23,7 @@ resources:
   ControllerPostPuppetRestartDeployment:
     type: OS::Heat::SoftwareDeployments
     properties:
+      name: ControllerPostPuppetRestartDeployment
       servers: {get_param: servers}
       config: {get_resource: ControllerPostPuppetRestartConfig}
       input_values: {get_param: input_values}
diff --git a/extraconfig/tasks/ssh/host_public_key.yaml b/extraconfig/tasks/ssh/host_public_key.yaml
index 02fdbf1c..ee06f0a9 100644
--- a/extraconfig/tasks/ssh/host_public_key.yaml
+++ b/extraconfig/tasks/ssh/host_public_key.yaml
@@ -36,6 +36,7 @@ resources:
       config: {get_resource: SshHostPubKeyConfig}
       server: {get_param: server}
       actions: {get_param: deployment_actions}
+      name: SshHostPubKeyDeployment
 
 
 outputs:
diff --git a/puppet/puppet-steps.j2 b/puppet/puppet-steps.j2
index 55aa6856..025598bf 100644
--- a/puppet/puppet-steps.j2
+++ b/puppet/puppet-steps.j2
@@ -24,6 +24,7 @@ resources:
   {{role.name}}ArtifactsDeploy:
     type: OS::Heat::StructuredDeployments
     properties:
+      name: {{role.name}}ArtifactsDeploy
       servers:  {get_param: [servers, {{role.name}}]}
       config: {get_resource: {{role.name}}ArtifactsConfig}
 
-- 
cgit 1.2.3-korg