Code Review
/
apex-tripleo-heat-templates.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
DB connection: prevent src address from binding to a VIP
[apex-tripleo-heat-templates.git]
/
deployed-server
/
deployed-server.yaml
diff --git
a/deployed-server/deployed-server.yaml
b/deployed-server/deployed-server.yaml
index
73b7158
..
e4f3550
100644
(file)
--- a/
deployed-server/deployed-server.yaml
+++ b/
deployed-server/deployed-server.yaml
@@
-21,7
+21,7
@@
parameters:
default: ''
name:
type: string
default: ''
name:
type: string
- default: ''
+ default: '
deployed-server
'
image_update_policy:
type: string
default: ''
image_update_policy:
type: string
default: ''
@@
-40,20
+40,18
@@
parameters:
default: {}
resources:
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:
deployed-server:
- type: OS::
TripleO::DeployedServerConfig
+ type: OS::
Heat::DeployedServer
properties:
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:
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
InstanceIdDeployment:
type: OS::Heat::StructuredDeployment
@@
-82,19
+80,23
@@
resources:
config: {get_resource: HostsEntryConfig}
server: {get_resource: deployed-server}
config: {get_resource: HostsEntryConfig}
server: {get_resource: deployed-server}
- ControlPlanePort:
+ ControlPlanePort
Impl
:
type: OS::TripleO::DeployedServer::ControlPlanePort
properties:
type: OS::TripleO::DeployedServer::ControlPlanePort
properties:
- Hostname: {get_attr: [HostsEntryDeployment, hostname]}
+ network: ctlplane
+ name:
+ list_join:
+ - '-'
+ - - {get_attr: [HostsEntryDeployment, hostname]}
+ - ctlplane
+ replacement_policy: AUTO
outputs:
outputs:
- # FIXME(shardy) this is needed because TemplateResource returns an
- # ARN not a UUID, which overflows the Deployment server_id column..
OS::stack_id:
OS::stack_id:
- value: {get_
attr: [deployed-server, "OS::stack_id"]
}
+ value: {get_
resource: deployed-server
}
networks:
value:
ctlplane:
networks:
value:
ctlplane:
- - {get_attr: [ControlPlanePort, ip_address]}
+ - {get_attr: [ControlPlanePort
Impl, fixed_ips, 0
, ip_address]}
name:
value: {get_attr: [HostsEntryDeployment, hostname]}
name:
value: {get_attr: [HostsEntryDeployment, hostname]}