diff options
author | Steven Hardy <shardy@redhat.com> | 2016-07-28 12:09:15 +0100 |
---|---|---|
committer | Steven Hardy <shardy@redhat.com> | 2016-07-29 15:13:13 +0100 |
commit | 7879f9d06b032ea486218bf7cdcf34e1d2bca23c (patch) | |
tree | 016685e6db5a38ab28fce9d9787ab154065c2ada /overcloud.yaml | |
parent | 0cb33ba188b699d4cd02ccd5dc3042d15ec3cf11 (diff) |
Convert AllNodesConfig hosts config to a map
Currently we have hard-coded parameters for each role, but to enable
custom roles, we need to pass a generic hosts list that can be joined
for all enabled roles.
Change-Id: I0606f462ff61c3a541342b63fee7d46ebfd1f4e0
Partially-Implements: blueprint custom-roles
Diffstat (limited to 'overcloud.yaml')
-rw-r--r-- | overcloud.yaml | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/overcloud.yaml b/overcloud.yaml index e80cb244..86b326f3 100644 --- a/overcloud.yaml +++ b/overcloud.yaml @@ -901,12 +901,23 @@ resources: allNodesConfig: type: OS::TripleO::AllNodes::SoftwareConfig properties: - compute_hosts: {get_attr: [Compute, hosts_entry]} - controller_hosts: {get_attr: [Controller, hosts_entry]} + hosts: + - 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]} - 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]} 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]}]} |