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
8a43b67
..
08d66f5
100644
(file)
--- a/
puppet/ceph-storage.yaml
+++ b/
puppet/ceph-storage.yaml
@@
-1,14
+1,15
@@
-heat_template_version: 201
5-04-30
+heat_template_version: 201
6-10-14
description: 'OpenStack ceph storage node configured by Puppet'
parameters:
description: 'OpenStack ceph storage node configured by Puppet'
parameters:
- Flavor:
+
OvercloudCephStorage
Flavor:
description: Flavor for the Ceph Storage node.
description: Flavor for the Ceph Storage node.
+ default: baremetal
type: string
constraints:
- custom_constraint: nova.flavor
type: string
constraints:
- custom_constraint: nova.flavor
- Image:
+
CephStorage
Image:
type: string
type: string
- default: overcloud-
ceph-storage
+ default: overcloud-
full
constraints:
- custom_constraint: glance.image
ImageUpdatePolicy:
constraints:
- custom_constraint: glance.image
ImageUpdatePolicy:
@@
-70,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
@@
-81,7
+81,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:
+
CephStorage
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
+91,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
@@
-98,14
+101,14
@@
parameters:
resources:
CephStorage:
resources:
CephStorage:
- type: OS::
Nova
::Server
+ type: OS::
TripleO
::Server
metadata:
os-collect-config:
command: {get_param: ConfigCommand}
properties:
metadata:
os-collect-config:
command: {get_param: ConfigCommand}
properties:
- image: {get_param: Image}
+ image: {get_param:
CephStorage
Image}
image_update_policy: {get_param: ImageUpdatePolicy}
image_update_policy: {get_param: ImageUpdatePolicy}
- flavor: {get_param: Flavor}
+ flavor: {get_param:
OvercloudCephStorage
Flavor}
key_name: {get_param: KeyName}
networks:
- network: ctlplane
key_name: {get_param: KeyName}
networks:
- network: ctlplane
@@
-117,7
+120,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:
CephStorage
SchedulerHints}
# Combine the NodeAdminUserData and NodeUserData mime archives
UserData:
# Combine the NodeAdminUserData and NodeUserData mime archives
UserData:
@@
-247,19
+250,23
@@
resources:
- heat_config_%{::deploy_config_name}
- ceph_extraconfig
- extraconfig
- heat_config_%{::deploy_config_name}
- ceph_extraconfig
- extraconfig
+ - service_names
- service_configs
- ceph_cluster # provided by CephClusterConfig
- ceph
- all_nodes # provided by allNodesConfig
- '"%{::osfamily}"'
- service_configs
- ceph_cluster # provided by CephClusterConfig
- ceph
- 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]}
@@
-270,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}
@@
-312,6
+318,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: [CephStorage, networks, ctlplane, 0]}
+ hostname:
+ description: Hostname of the server
+ value: {get_attr: [CephStorage, name]}
hosts_entry:
value:
str_replace:
hosts_entry:
value:
str_replace: