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
Reinstate CloudDomain properties for Controller/Compute roles
[apex-tripleo-heat-templates.git]
/
puppet
/
cinder-storage.yaml
diff --git
a/puppet/cinder-storage.yaml
b/puppet/cinder-storage.yaml
index
fd6a425
..
ba84fb7
100644
(file)
--- a/
puppet/cinder-storage.yaml
+++ b/
puppet/cinder-storage.yaml
@@
-1,4
+1,4
@@
-heat_template_version: 201
5-04-30
+heat_template_version: 201
6-10-14
description: 'OpenStack cinder storage configured by Puppet'
parameters:
BlockStorageImage:
description: 'OpenStack cinder storage configured by Puppet'
parameters:
BlockStorageImage:
@@
-20,9
+20,10
@@
parameters:
BlockStorageIPs:
default: {}
type: json
BlockStorageIPs:
default: {}
type: json
- Flavor:
+
OvercloudBlockStorage
Flavor:
description: Flavor for block storage nodes to request when deploying.
type: string
description: Flavor for block storage nodes to request when deploying.
type: string
+ default: baremetal
constraints:
- custom_constraint: nova.flavor
KeyName:
constraints:
- custom_constraint: nova.flavor
KeyName:
@@
-72,7
+73,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
@@
-263,7
+263,6
@@
resources:
- volume
- all_nodes # provided by allNodesConfig
- '"%{::osfamily}"'
- volume
- all_nodes # provided by allNodesConfig
- '"%{::osfamily}"'
- - common
- network
merge_behavior: deeper
datafiles:
- network
merge_behavior: deeper
datafiles:
@@
-271,9
+270,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}
- common:
- raw_data: {get_file: hieradata/common.yaml}
+ 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]}
@@
-284,7
+284,6
@@
resources:
extraconfig:
mapped_data: {get_param: ExtraConfig}
volume:
extraconfig:
mapped_data: {get_param: ExtraConfig}
volume:
- raw_data: {get_file: hieradata/volume.yaml}
mapped_data:
# Cinder
tripleo::profile::base::cinder::volume::iscsi::cinder_iscsi_ip_address: {get_input: cinder_iscsi_ip_address}
mapped_data:
# Cinder
tripleo::profile::base::cinder::volume::iscsi::cinder_iscsi_ip_address: {get_input: cinder_iscsi_ip_address}