aboutsummaryrefslogtreecommitdiffstats
path: root/deployed-server/deployed-server.yaml
diff options
context:
space:
mode:
authorJames Slagle <jslagle@redhat.com>2016-12-05 16:19:55 -0500
committerJames Slagle <jslagle@redhat.com>2016-12-13 15:50:29 -0500
commit0097da77103e1cd34418d754cc6779b53f0be2f1 (patch)
tree245daedd3997f16eac0128ba1146d789e3bd02b4 /deployed-server/deployed-server.yaml
parent1e88f875239b30de24552450b623e6892941fa1e (diff)
Use OS::Heat::DeployedServer
The new DeployedServer resource in Heat will provide a native resource for Server resources that are not orchestrated via Nova. This will allow associating SoftwareDeployment's with servers that have not been launched with Nova with Heat directly. With the new resource, all of the SoftwareConfigTransport methods are available, including POLL_TEMP_URL. This patch also updates the get-occ-config.sh script to configure the requests collector in os-collect-config.conf on the deployed servers. Change-Id: I4b80421088acca709fe3f92741c5c052be483131 Partially-implements: blueprint split-stack-software-configuration Depends-On: I07b9a053ecd3ef4411b602bbc6ef985224834cf8
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 22797c2..10e934d 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: os-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: