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 /puppet | |
| 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 'puppet')
| -rw-r--r-- | puppet/all-nodes-config.yaml | 26 |
1 files changed, 2 insertions, 24 deletions
diff --git a/puppet/all-nodes-config.yaml b/puppet/all-nodes-config.yaml index 803a5d49..db8bb450 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: @@ -89,21 +81,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: |