aboutsummaryrefslogtreecommitdiffstats
path: root/deployed-server/deployed-server.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-12-20 20:24:22 +0000
committerGerrit Code Review <review@openstack.org>2016-12-20 20:24:22 +0000
commit724670088954dd76c0fedcbae91cc58826ba0e0d (patch)
treee427d5c87cd3bbe7e8b1b87cf335ed7c6881e88b /deployed-server/deployed-server.yaml
parent08bc584cd600626bec5e1aeef0ddf91a49d1eb9c (diff)
parent0097da77103e1cd34418d754cc6779b53f0be2f1 (diff)
Merge "Use OS::Heat::DeployedServer"
Diffstat (limited to 'deployed-server/deployed-server.yaml')
-rw-r--r--deployed-server/deployed-server.yaml16
1 files changed, 6 insertions, 10 deletions
diff --git a/deployed-server/deployed-server.yaml b/deployed-server/deployed-server.yaml
index 73b71588..3ba7abac 100644
--- a/deployed-server/deployed-server.yaml
+++ b/deployed-server/deployed-server.yaml
@@ -21,7 +21,7 @@ parameters:
default: ''
name:
type: string
- default: ''
+ default: 'deployed-server'
image_update_policy:
type: string
default: ''
@@ -40,20 +40,18 @@ parameters:
default: {}
resources:
- # We just need something which returns a unique ID, but we can't
- # use RandomString because RefId returns the value, not the physical
- # resource ID, SoftwareConfig should work as it returns a UUID
deployed-server:
- type: OS::TripleO::DeployedServerConfig
+ type: OS::Heat::DeployedServer
properties:
- user_data_format: SOFTWARE_CONFIG
+ name: {get_param: name}
+ software_config_transport: {get_param: software_config_transport}
InstanceIdConfig:
type: OS::Heat::StructuredConfig
properties:
group: apply-config
config:
- instance-id: {get_attr: [deployed-server, "OS::stack_id"]}
+ instance-id: {get_resource: deployed-server}
InstanceIdDeployment:
type: OS::Heat::StructuredDeployment
@@ -88,10 +86,8 @@ resources:
Hostname: {get_attr: [HostsEntryDeployment, hostname]}
outputs:
- # FIXME(shardy) this is needed because TemplateResource returns an
- # ARN not a UUID, which overflows the Deployment server_id column..
OS::stack_id:
- value: {get_attr: [deployed-server, "OS::stack_id"]}
+ value: {get_resource: deployed-server}
networks:
value:
ctlplane: