openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Implement mongo_node_ips hiera key"

Browse Source
This commit is contained in:
Jenkins 2015-03-31 12:48:45 +00:00 committed by Gerrit Code Review
commit 2f5d1a609e
3 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
all-nodes-config.yaml
View File

@ -6,6 +6,8 @@ parameters:
type: comma_delimited_list type: comma_delimited_list
controller_hosts: controller_hosts:
type: comma_delimited_list type: comma_delimited_list
controller_ips:
type: comma_delimited_list
block_storage_hosts: block_storage_hosts:
type: comma_delimited_list type: comma_delimited_list
object_storage_hosts: object_storage_hosts:

1
overcloud-without-mergepy.yaml
View File

@ -695,6 +695,7 @@ resources:
properties: properties:
compute_hosts: {get_attr: [Compute, hosts_entry]} compute_hosts: {get_attr: [Compute, hosts_entry]}
controller_hosts: {get_attr: [Controller, hosts_entry]} controller_hosts: {get_attr: [Controller, hosts_entry]}
controller_ips: {get_attr: [Controller, ip_address]}
block_storage_hosts: {get_attr: [BlockStorage, hosts_entry]} block_storage_hosts: {get_attr: [BlockStorage, hosts_entry]}
object_storage_hosts: {get_attr: [ObjectStorage, hosts_entry]} object_storage_hosts: {get_attr: [ObjectStorage, hosts_entry]}
ceph_storage_hosts: {get_attr: [CephStorage, hosts_entry]} ceph_storage_hosts: {get_attr: [CephStorage, hosts_entry]}

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

@ -6,6 +6,8 @@ parameters:
type: comma_delimited_list type: comma_delimited_list
controller_hosts: controller_hosts:
type: comma_delimited_list type: comma_delimited_list
controller_ips:
type: comma_delimited_list
block_storage_hosts: block_storage_hosts:
type: comma_delimited_list type: comma_delimited_list
object_storage_hosts: object_storage_hosts:
@ -52,6 +54,10 @@ resources:
list_join: list_join:
- ',' - ','
- {get_param: controller_names} - {get_param: controller_names}
mongo_node_ips:
list_join:
- ','
- {get_param: controller_ips}
outputs: outputs:
config_id: config_id: