aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-04-11 22:22:14 +0000
committerGerrit Code Review <review@openstack.org>2017-04-11 22:22:14 +0000
commitd33948a45bfbd8f8ee04a8a97413324983e6ccff (patch)
treeb1f0e1e268649ad0fead4fe96d955afafe4ebe6d
parent349eb9320975d55d35365b3290e0c066ccb3938c (diff)
parent04097e8b40750ad501839f04d8bc4cfbfc7d8b42 (diff)
Merge "Add missing name properties on deloyment resources"
-rw-r--r--deployed-server/deployed-server.yaml2
-rw-r--r--puppet/role.role.j2.yaml1
2 files changed, 3 insertions, 0 deletions
diff --git a/deployed-server/deployed-server.yaml b/deployed-server/deployed-server.yaml
index 1e8afb25..afdb5d0c 100644
--- a/deployed-server/deployed-server.yaml
+++ b/deployed-server/deployed-server.yaml
@@ -81,6 +81,7 @@ resources:
InstanceIdDeployment:
type: OS::Heat::StructuredDeployment
properties:
+ name: InstanceIdDeployment
config: {get_resource: InstanceIdConfig}
server: {get_resource: deployed-server}
depends_on: UpgradeInitDeployment
@@ -103,6 +104,7 @@ resources:
HostsEntryDeployment:
type: OS::Heat::SoftwareDeployment
properties:
+ name: HostsEntryDeployment
config: {get_resource: HostsEntryConfig}
server: {get_resource: deployed-server}
diff --git a/puppet/role.role.j2.yaml b/puppet/role.role.j2.yaml
index 1f68f41f..9227b527 100644
--- a/puppet/role.role.j2.yaml
+++ b/puppet/role.role.j2.yaml
@@ -483,6 +483,7 @@ resources:
type: OS::Heat::SoftwareDeployment
depends_on: NetworkDeployment
properties:
+ name: UpdateDeployment
config: {get_resource: UpdateConfig}
server: {get_resource: {{role}}}
input_values: