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 "Ironic: service catalog entries should not have a suffix"
[apex-tripleo-heat-templates.git]
/
puppet
/
cinder-storage.yaml
diff --git
a/puppet/cinder-storage.yaml
b/puppet/cinder-storage.yaml
index
a72ca35
..
ef3f08f
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:
@@
-37,10
+38,6
@@
parameters:
description: The user password for SNMPd with readonly rights running on all Overcloud nodes
type: string
hidden: true
description: The user password for SNMPd with readonly rights running on all Overcloud nodes
type: string
hidden: true
- EnablePackageInstall:
- default: 'false'
- description: Set to true to enable package installation via Puppet
- type: boolean
UpdateIdentifier:
default: ''
type: string
UpdateIdentifier:
default: ''
type: string
@@
-72,7
+69,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
@@
-110,7
+106,7
@@
resources:
properties:
image:
{get_param: BlockStorageImage}
properties:
image:
{get_param: BlockStorageImage}
- flavor: {get_param: Flavor}
+ flavor: {get_param:
OvercloudBlockStorage
Flavor}
key_name: {get_param: KeyName}
networks:
- network: ctlplane
key_name: {get_param: KeyName}
networks:
- network: ctlplane
@@
-238,12
+234,6
@@
resources:
input_values:
snmpd_readonly_user_name: {get_param: SnmpdReadonlyUserName}
snmpd_readonly_user_password: {get_param: SnmpdReadonlyUserPassword}
input_values:
snmpd_readonly_user_name: {get_param: SnmpdReadonlyUserName}
snmpd_readonly_user_password: {get_param: SnmpdReadonlyUserPassword}
- cinder_iscsi_ip_address:
- str_replace:
- template: "'IP'"
- params:
- IP: {get_attr: [NetIpMap, net_ip_uri_map, {get_param: [ServiceNetMap, CinderIscsiNetwork]}]}
- enable_package_install: {get_param: EnablePackageInstall}
enable_package_upgrade: {get_attr: [UpdateDeployment, update_managed_packages]}
# Map heat metadata into hiera datafiles
enable_package_upgrade: {get_attr: [UpdateDeployment, update_managed_packages]}
# Map heat metadata into hiera datafiles
@@
-263,28
+253,22
@@
resources:
- volume
- all_nodes # provided by allNodesConfig
- '"%{::osfamily}"'
- volume
- all_nodes # provided by allNodesConfig
- '"%{::osfamily}"'
- - network
merge_behavior: deeper
datafiles:
service_names:
mapped_data:
service_names: {get_param: ServiceNames}
service_configs:
merge_behavior: deeper
datafiles:
service_names:
mapped_data:
service_names: {get_param: ServiceNames}
service_configs:
- mapped_data: {get_param: ServiceConfigSettings}
- network:
mapped_data:
mapped_data:
- net_ip_map: {get_attr: [NetIpMap, net_ip_map]}
-
net_ip_subnet_map: {get_attr: [NetIpMap, net_ip_subnet_map]
}
-
net_ip_uri_map: {get_attr: [NetIpMap, net_ip_uri
_map]}
+ map_replace:
+
- {get_param: ServiceConfigSettings
}
+
- values: {get_attr: [NetIpMap, net_ip
_map]}
volume_extraconfig:
mapped_data: {get_param: BlockStorageExtraConfig}
extraconfig:
mapped_data: {get_param: ExtraConfig}
volume:
mapped_data:
volume_extraconfig:
mapped_data: {get_param: BlockStorageExtraConfig}
extraconfig:
mapped_data: {get_param: ExtraConfig}
volume:
mapped_data:
- # Cinder
- tripleo::profile::base::cinder::volume::iscsi::cinder_iscsi_ip_address: {get_input: cinder_iscsi_ip_address}
- tripleo::packages::enable_install: {get_input: enable_package_install}
tripleo::packages::enable_upgrade: {get_input: enable_package_upgrade}
snmpd_readonly_user_name: {get_input: snmpd_readonly_user_name}
snmpd_readonly_user_password: {get_input: snmpd_readonly_user_password}
tripleo::packages::enable_upgrade: {get_input: enable_package_upgrade}
snmpd_readonly_user_name: {get_input: snmpd_readonly_user_name}
snmpd_readonly_user_password: {get_input: snmpd_readonly_user_password}