From 7879f9d06b032ea486218bf7cdcf34e1d2bca23c Mon Sep 17 00:00:00 2001
From: Steven Hardy <shardy@redhat.com>
Date: Thu, 28 Jul 2016 12:09:15 +0100
Subject: 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
---
 puppet/all-nodes-config.yaml | 26 ++------------------------
 1 file changed, 2 insertions(+), 24 deletions(-)

(limited to 'puppet/all-nodes-config.yaml')

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:
-- 
cgit 1.2.3-korg