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
/
ceph-storage.yaml
diff --git
a/puppet/ceph-storage.yaml
b/puppet/ceph-storage.yaml
index
77ca4dc
..
829456b
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:
@@
-21,10
+22,6
@@
parameters:
default: default
constraints:
- custom_constraint: nova.keypair
default: default
constraints:
- custom_constraint: nova.keypair
- EnablePackageInstall:
- default: 'false'
- description: Set to true to enable package installation via Puppet
- type: boolean
ServiceNetMap:
default: {}
description: Mapping of service_name -> network name. Typically set
ServiceNetMap:
default: {}
description: Mapping of service_name -> network name. Typically set
@@
-70,7
+67,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
+77,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: {}
@@
-106,9
+102,9
@@
resources:
os-collect-config:
command: {get_param: ConfigCommand}
properties:
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
@@
-120,7
+116,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:
@@
-234,10
+230,7
@@
resources:
config: {get_resource: CephStorageConfig}
server: {get_resource: CephStorage}
input_values:
config: {get_resource: CephStorageConfig}
server: {get_resource: CephStorage}
input_values:
- enable_package_install: {get_param: EnablePackageInstall}
enable_package_upgrade: {get_attr: [UpdateDeployment, update_managed_packages]}
enable_package_upgrade: {get_attr: [UpdateDeployment, update_managed_packages]}
- ceph_cluster_network: {get_attr: [NetIpMap, net_ip_subnet_map, {get_param: [ServiceNetMap, CephClusterNetwork]}]}
- ceph_public_network: {get_attr: [NetIpMap, net_ip_subnet_map, {get_param: [ServiceNetMap, CephPublicNetwork]}]}
CephStorageConfig:
type: OS::Heat::StructuredConfig
CephStorageConfig:
type: OS::Heat::StructuredConfig
@@
-252,37
+245,25
@@
resources:
- extraconfig
- service_names
- service_configs
- extraconfig
- service_names
- service_configs
- - ceph_cluster # provided by CephClusterConfig
- - ceph
- all_nodes # provided by allNodesConfig
- '"%{::osfamily}"'
- all_nodes # provided by allNodesConfig
- '"%{::osfamily}"'
- - common
- - 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}
- common:
- raw_data: {get_file: hieradata/common.yaml}
- 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]}
ceph_extraconfig:
mapped_data: {get_param: CephStorageExtraConfig}
extraconfig:
mapped_data: {get_param: ExtraConfig}
ceph:
ceph_extraconfig:
mapped_data: {get_param: CephStorageExtraConfig}
extraconfig:
mapped_data: {get_param: ExtraConfig}
ceph:
- raw_data: {get_file: hieradata/ceph.yaml}
mapped_data:
mapped_data:
- tripleo::packages::enable_install: {get_input: enable_package_install}
tripleo::packages::enable_upgrade: {get_input: enable_package_upgrade}
tripleo::packages::enable_upgrade: {get_input: enable_package_upgrade}
- ceph::profile::params::cluster_network: {get_input: ceph_cluster_network}
- ceph::profile::params::public_network: {get_input: ceph_public_network}
# Resource for site-specific injection of root certificate
NodeTLSCAData:
# Resource for site-specific injection of root certificate
NodeTLSCAData: