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
9bbef86
..
ba84fb7
100644
(file)
--- a/
puppet/cinder-storage.yaml
+++ b/
puppet/cinder-storage.yaml
@@
-1,9
+1,11
@@
-heat_template_version: 201
5-04-30
+heat_template_version: 201
6-10-14
description: 'OpenStack cinder storage configured by Puppet'
parameters:
description: 'OpenStack cinder storage configured by Puppet'
parameters:
- Image:
- default: overcloud-
cinder-volume
+
BlockStorage
Image:
+ default: overcloud-
full
type: string
type: string
+ constraints:
+ - custom_constraint: glance.image
ExtraConfig:
default: {}
description: |
ExtraConfig:
default: {}
description: |
@@
-18,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:
@@
-70,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
@@
-81,7
+83,7
@@
parameters:
Extra properties or metadata passed to Nova for the created nodes in
the overcloud. It's accessible via the Nova metadata API.
type: json
Extra properties or metadata passed to Nova for the created nodes in
the overcloud. It's accessible via the Nova metadata API.
type: json
- SchedulerHints:
+
BlockStorage
SchedulerHints:
type: json
description: Optional scheduler hints to pass to nova
default: {}
type: json
description: Optional scheduler hints to pass to nova
default: {}
@@
-91,6
+93,9
@@
parameters:
ServiceConfigSettings:
type: json
default: {}
ServiceConfigSettings:
type: json
default: {}
+ ServiceNames:
+ type: comma_delimited_list
+ default: []
ConfigCommand:
type: string
description: Command which will be run whenever configuration data changes
ConfigCommand:
type: string
description: Command which will be run whenever configuration data changes
@@
-104,7
+109,7
@@
resources:
command: {get_param: ConfigCommand}
properties:
image:
command: {get_param: ConfigCommand}
properties:
image:
- {get_param: Image}
+ {get_param:
BlockStorage
Image}
flavor: {get_param: Flavor}
key_name: {get_param: KeyName}
networks:
flavor: {get_param: Flavor}
key_name: {get_param: KeyName}
networks:
@@
-117,7
+122,7
@@
resources:
params: {get_param: HostnameMap}
software_config_transport: {get_param: SoftwareConfigTransport}
metadata: {get_param: ServerMetadata}
params: {get_param: HostnameMap}
software_config_transport: {get_param: SoftwareConfigTransport}
metadata: {get_param: ServerMetadata}
- scheduler_hints: {get_param: SchedulerHints}
+ scheduler_hints: {get_param:
BlockStorage
SchedulerHints}
# Combine the NodeAdminUserData and NodeUserData mime archives
UserData:
# Combine the NodeAdminUserData and NodeUserData mime archives
UserData:
@@
-253,18
+258,22
@@
resources:
- heat_config_%{::deploy_config_name}
- volume_extraconfig
- extraconfig
- heat_config_%{::deploy_config_name}
- volume_extraconfig
- extraconfig
+ - service_names
- service_configs
- volume
- all_nodes # provided by allNodesConfig
- '"%{::osfamily}"'
- service_configs
- volume
- all_nodes # provided by allNodesConfig
- '"%{::osfamily}"'
- - common
- network
merge_behavior: deeper
datafiles:
- network
merge_behavior: deeper
datafiles:
+ service_names:
+ mapped_data:
+ service_names: {get_param: ServiceNames}
service_configs:
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]}
@@
-275,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}
@@
-313,6
+321,12
@@
resources:
get_param: UpdateIdentifier
outputs:
get_param: UpdateIdentifier
outputs:
+ ip_address:
+ description: IP address of the server in the ctlplane network
+ value: {get_attr: [BlockStorage, networks, ctlplane, 0]}
+ hostname:
+ description: Hostname of the server
+ value: {get_attr: [BlockStorage, name]}
hosts_entry:
value:
str_replace:
hosts_entry:
value:
str_replace: