aboutsummaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-12-22 11:58:32 +0000
committerGerrit Code Review <review@openstack.org>2016-12-22 11:58:32 +0000
commit58f3d248bab6ea0ed3433fd3aa485d8c93060f56 (patch)
tree31885a68b376bdb5064cee63254f4ec4d3a378e5 /puppet
parent33bdba26d668d91f213515a91f8797b9b249d84a (diff)
parent8d796ea0e4afd69f9776d07f491b1a0d83e34128 (diff)
Merge "Add a per service bootstrap node variable"
Diffstat (limited to 'puppet')
-rw-r--r--puppet/all-nodes-config.yaml3
1 files changed, 3 insertions, 0 deletions
diff --git a/puppet/all-nodes-config.yaml b/puppet/all-nodes-config.yaml
index 0a8bec6e..5f56fe28 100644
--- a/puppet/all-nodes-config.yaml
+++ b/puppet/all-nodes-config.yaml
@@ -28,6 +28,8 @@ parameters:
type: json
short_service_node_names:
type: json
+ short_service_bootstrap_node:
+ type: json
controller_names:
type: comma_delimited_list
memcache_node_ips:
@@ -125,6 +127,7 @@ resources:
- {get_param: service_ips}
- {get_param: service_node_names}
- {get_param: short_service_node_names}
+ - {get_param: short_service_bootstrap_node}
- controller_node_ips:
list_join:
- ','