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
Merge "Add sample usage of StorageMgmt network for compute nodes"
[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
afdb5d0
..
16deb7d
100644
(file)
--- a/
deployed-server/deployed-server.yaml
+++ b/
deployed-server/deployed-server.yaml
@@
-1,4
+1,4
@@
-heat_template_version:
ocata
+heat_template_version:
pike
parameters:
image:
type: string
parameters:
image:
type: string
@@
-44,6
+44,9
@@
parameters:
Command or script snippet to run on all overcloud nodes to
initialize the upgrade process. E.g. a repository switch.
default: ''
Command or script snippet to run on all overcloud nodes to
initialize the upgrade process. E.g. a repository switch.
default: ''
+ deployment_swift_data:
+ type: json
+ default: {}
resources:
deployed-server:
resources:
deployed-server:
@@
-51,6
+54,7
@@
resources:
properties:
name: {get_param: name}
software_config_transport: {get_param: software_config_transport}
properties:
name: {get_param: name}
software_config_transport: {get_param: software_config_transport}
+ deployment_swift_data: {get_param: deployment_swift_data}
UpgradeInitConfig:
type: OS::Heat::SoftwareConfig
UpgradeInitConfig:
type: OS::Heat::SoftwareConfig
@@
-133,3
+137,5
@@
outputs:
- {get_attr: [ControlPlanePort, fixed_ips, 0, ip_address]}
name:
value: {get_attr: [HostsEntryDeployment, hostname]}
- {get_attr: [ControlPlanePort, fixed_ips, 0, ip_address]}
name:
value: {get_attr: [HostsEntryDeployment, hostname]}
+ os_collect_config:
+ value: {get_attr: [deployed-server, os_collect_config]}