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 "Align node_ips hiera keys with the service name."
[apex-tripleo-heat-templates.git]
/
puppet
/
ceph-storage.yaml
diff --git
a/puppet/ceph-storage.yaml
b/puppet/ceph-storage.yaml
index
bb3d758
..
08d66f5
100644
(file)
--- a/
puppet/ceph-storage.yaml
+++ b/
puppet/ceph-storage.yaml
@@
-1,4
+1,4
@@
-heat_template_version: 201
5-04-30
+heat_template_version: 201
6-10-14
description: 'OpenStack ceph storage node configured by Puppet'
parameters:
OvercloudCephStorageFlavor:
description: 'OpenStack ceph storage node configured by Puppet'
parameters:
OvercloudCephStorageFlavor:
@@
-71,7
+71,6
@@
parameters:
constraints:
- allowed_values: [POLL_SERVER_CFN, POLL_SERVER_HEAT, POLL_TEMP_URL, ZAQAR_MESSAGE]
CloudDomain:
constraints:
- allowed_values: [POLL_SERVER_CFN, POLL_SERVER_HEAT, POLL_TEMP_URL, ZAQAR_MESSAGE]
CloudDomain:
- default: ''
type: string
description: >
The DNS domain used for the hosts. This should match the dhcp_domain
type: string
description: >
The DNS domain used for the hosts. This should match the dhcp_domain
@@
-264,7
+263,10
@@
resources:
mapped_data:
service_names: {get_param: ServiceNames}
service_configs:
mapped_data:
service_names: {get_param: ServiceNames}
service_configs:
- mapped_data: {get_param: ServiceConfigSettings}
+ mapped_data:
+ map_replace:
+ - {get_param: ServiceConfigSettings}
+ - values: {get_attr: [NetIpMap, net_ip_map]}
network:
mapped_data:
net_ip_map: {get_attr: [NetIpMap, net_ip_map]}
network:
mapped_data:
net_ip_map: {get_attr: [NetIpMap, net_ip_map]}
@@
-275,7
+277,6
@@
resources:
extraconfig:
mapped_data: {get_param: ExtraConfig}
ceph:
extraconfig:
mapped_data: {get_param: ExtraConfig}
ceph:
- raw_data: {get_file: hieradata/ceph.yaml}
mapped_data:
tripleo::packages::enable_install: {get_input: enable_package_install}
tripleo::packages::enable_upgrade: {get_input: enable_package_upgrade}
mapped_data:
tripleo::packages::enable_install: {get_input: enable_package_install}
tripleo::packages::enable_upgrade: {get_input: enable_package_upgrade}