Merge "Remove HostEntryDeployment"
This commit is contained in:
commit
884ffe6d8c
|
@ -69,28 +69,6 @@ resources:
|
|||
software_config_transport: {get_param: software_config_transport}
|
||||
deployment_swift_data: {get_param: deployment_swift_data}
|
||||
|
||||
HostsEntryConfig:
|
||||
type: OS::Heat::SoftwareConfig
|
||||
properties:
|
||||
group: script
|
||||
config: |
|
||||
#!/bin/bash
|
||||
set -eux
|
||||
mkdir -p $heat_outputs_path
|
||||
host=$(hostname -s)
|
||||
echo -n $host > $heat_outputs_path.hostname
|
||||
cat $heat_outputs_path.hostname
|
||||
outputs:
|
||||
- name: hostname
|
||||
description: hostname
|
||||
|
||||
HostsEntryDeployment:
|
||||
type: OS::Heat::SoftwareDeployment
|
||||
properties:
|
||||
name: HostsEntryDeployment
|
||||
config: {get_resource: HostsEntryConfig}
|
||||
server: {get_resource: deployed-server}
|
||||
|
||||
DeployedServerBootstrapConfig:
|
||||
type: OS::TripleO::DeployedServer::Bootstrap
|
||||
properties:
|
||||
|
@ -104,11 +82,7 @@ resources:
|
|||
name:
|
||||
list_join:
|
||||
- '-'
|
||||
- - yaql:
|
||||
expression: switch(not $.data.hostname.isEmpty() => $.data.hostname, $.data.name=>$.data.name)
|
||||
data:
|
||||
hostname: {get_attr: [HostsEntryDeployment, hostname]}
|
||||
name: {get_param: name}
|
||||
- - {get_param: name}
|
||||
- ctlplane
|
||||
replacement_policy: AUTO
|
||||
|
||||
|
@ -124,11 +98,6 @@ outputs:
|
|||
ctlplane:
|
||||
- subnets: {get_attr: [ControlPlanePort, subnets]}
|
||||
name:
|
||||
value:
|
||||
yaql:
|
||||
expression: switch(not $.data.hostname.isEmpty() => $.data.hostname, $.data.name=>$.data.name)
|
||||
data:
|
||||
hostname: {get_attr: [HostsEntryDeployment, hostname]}
|
||||
name: {get_param: name}
|
||||
value: {get_param: name}
|
||||
os_collect_config:
|
||||
value: {get_attr: [deployed-server, os_collect_config]}
|
||||
|
|
Loading…
Reference in New Issue