openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Convert AllNodesConfig hosts config to a map"

This commit is contained in:
Jenkins 2016-08-08 12:55:28 +00:00 committed by Gerrit Code Review
parent e06ff3d45b 7879f9d06b
commit ff43f1d38a
2 changed files with 18 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
overcloud.yaml
View File

@ -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]}]}

26
puppet/all-nodes-config.yaml
View File

@ -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: