summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-08-08 12:55:28 +0000
committerGerrit Code Review <review@openstack.org>2016-08-08 12:55:28 +0000
commitff43f1d38ac2821b24ed81fc4b3537be7035f8a5 (patch)
tree9564f62e28665f980034e10d2f038a43980a6424
parente06ff3d45b2d92777ee16360ff55d5d4c10ac433 (diff)
parent7879f9d06b032ea486218bf7cdcf34e1d2bca23c (diff)
Merge "Convert AllNodesConfig hosts config to a map"
-rw-r--r--overcloud.yaml21
-rw-r--r--puppet/all-nodes-config.yaml26
2 files changed, 18 insertions, 29 deletions
diff --git a/overcloud.yaml b/overcloud.yaml
index e3d0bdf0..acd9b1fa 100644
--- a/overcloud.yaml
+++ b/overcloud.yaml
@@ -723,12 +723,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]}]}
diff --git a/puppet/all-nodes-config.yaml b/puppet/all-nodes-config.yaml
index 4c9355d5..793b17dd 100644
--- a/puppet/all-nodes-config.yaml
+++ b/puppet/all-nodes-config.yaml
@@ -2,18 +2,10 @@ heat_template_version: 2015-04-30
description: 'All Nodes Config for Puppet'
parameters:
- compute_hosts:
- type: comma_delimited_list
- controller_hosts:
+ hosts:
type: comma_delimited_list
controller_ips:
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:
type: comma_delimited_list
rabbit_node_ips:
@@ -91,21 +83,7 @@ resources:
hosts:
list_join:
- "\n"
- - - list_join:
- - "\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}
+ - {get_param: hosts}
hiera:
datafiles:
bootstrap_node: