Merge "Convert AllNodesConfig hosts config to a map"
This commit is contained in:
commit
ff43f1d38a
|
@ -723,12 +723,23 @@ resources:
|
||||||
allNodesConfig:
|
allNodesConfig:
|
||||||
type: OS::TripleO::AllNodes::SoftwareConfig
|
type: OS::TripleO::AllNodes::SoftwareConfig
|
||||||
properties:
|
properties:
|
||||||
compute_hosts: {get_attr: [Compute, hosts_entry]}
|
hosts:
|
||||||
controller_hosts: {get_attr: [Controller, hosts_entry]}
|
- list_join:
|
||||||
|
- '\n'
|
||||||
|
- {get_attr: [Compute, hosts_entry]}
|
||||||
|
- list_join:
|
||||||
|
- '\n'
|
||||||
|
- {get_attr: [Controller, hosts_entry]}
|
||||||
|
- list_join:
|
||||||
|
- '\n'
|
||||||
|
- {get_attr: [BlockStorage, hosts_entry]}
|
||||||
|
- list_join:
|
||||||
|
- '\n'
|
||||||
|
- {get_attr: [ObjectStorage, hosts_entry]}
|
||||||
|
- list_join:
|
||||||
|
- '\n'
|
||||||
|
- {get_attr: [CephStorage, hosts_entry]}
|
||||||
controller_ips: {get_attr: [Controller, ip_address]}
|
controller_ips: {get_attr: [Controller, ip_address]}
|
||||||
block_storage_hosts: {get_attr: [BlockStorage, hosts_entry]}
|
|
||||||
object_storage_hosts: {get_attr: [ObjectStorage, hosts_entry]}
|
|
||||||
ceph_storage_hosts: {get_attr: [CephStorage, hosts_entry]}
|
|
||||||
controller_names: {get_attr: [Controller, hostname]}
|
controller_names: {get_attr: [Controller, hostname]}
|
||||||
rabbit_node_ips: {get_attr: [ControllerIpListMap, net_ip_map, {get_param: [ServiceNetMap, RabbitMqNetwork]}]}
|
rabbit_node_ips: {get_attr: [ControllerIpListMap, net_ip_map, {get_param: [ServiceNetMap, RabbitMqNetwork]}]}
|
||||||
mongo_node_ips: {get_attr: [ControllerIpListMap, net_ip_map, {get_param: [ServiceNetMap, MongoDbNetwork]}]}
|
mongo_node_ips: {get_attr: [ControllerIpListMap, net_ip_map, {get_param: [ServiceNetMap, MongoDbNetwork]}]}
|
||||||
|
|
|
@ -2,18 +2,10 @@ heat_template_version: 2015-04-30
|
||||||
description: 'All Nodes Config for Puppet'
|
description: 'All Nodes Config for Puppet'
|
||||||
|
|
||||||
parameters:
|
parameters:
|
||||||
compute_hosts:
|
hosts:
|
||||||
type: comma_delimited_list
|
|
||||||
controller_hosts:
|
|
||||||
type: comma_delimited_list
|
type: comma_delimited_list
|
||||||
controller_ips:
|
controller_ips:
|
||||||
type: comma_delimited_list
|
type: comma_delimited_list
|
||||||
block_storage_hosts:
|
|
||||||
type: comma_delimited_list
|
|
||||||
object_storage_hosts:
|
|
||||||
type: comma_delimited_list
|
|
||||||
ceph_storage_hosts:
|
|
||||||
type: comma_delimited_list
|
|
||||||
controller_names:
|
controller_names:
|
||||||
type: comma_delimited_list
|
type: comma_delimited_list
|
||||||
rabbit_node_ips:
|
rabbit_node_ips:
|
||||||
|
@ -91,21 +83,7 @@ resources:
|
||||||
hosts:
|
hosts:
|
||||||
list_join:
|
list_join:
|
||||||
- "\n"
|
- "\n"
|
||||||
- - list_join:
|
- {get_param: hosts}
|
||||||
- "\n"
|
|
||||||
- {get_param: compute_hosts}
|
|
||||||
- list_join:
|
|
||||||
- "\n"
|
|
||||||
- {get_param: controller_hosts}
|
|
||||||
- list_join:
|
|
||||||
- "\n"
|
|
||||||
- {get_param: block_storage_hosts}
|
|
||||||
- list_join:
|
|
||||||
- "\n"
|
|
||||||
- {get_param: object_storage_hosts}
|
|
||||||
- list_join:
|
|
||||||
- "\n"
|
|
||||||
- {get_param: ceph_storage_hosts}
|
|
||||||
hiera:
|
hiera:
|
||||||
datafiles:
|
datafiles:
|
||||||
bootstrap_node:
|
bootstrap_node:
|
||||||
|
|
Loading…
Reference in New Issue