Code Review
/
apex-tripleo-heat-templates.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Configure authtoken in nova-placement api service"
[apex-tripleo-heat-templates.git]
/
puppet
/
all-nodes-config.yaml
diff --git
a/puppet/all-nodes-config.yaml
b/puppet/all-nodes-config.yaml
index
0a8bec6
..
ee43c3a
100644
(file)
--- a/
puppet/all-nodes-config.yaml
+++ b/
puppet/all-nodes-config.yaml
@@
-1,4
+1,4
@@
-heat_template_version:
2016-10-14
+heat_template_version:
ocata
description: 'All Nodes Config for Puppet'
parameters:
description: 'All Nodes Config for Puppet'
parameters:
@@
-28,6
+28,8
@@
parameters:
type: json
short_service_node_names:
type: json
type: json
short_service_node_names:
type: json
+ short_service_bootstrap_node:
+ type: json
controller_names:
type: comma_delimited_list
memcache_node_ips:
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: service_ips}
- {get_param: service_node_names}
- {get_param: short_service_node_names}
+ - {get_param: short_service_bootstrap_node}
- controller_node_ips:
list_join:
- ','
- controller_node_ips:
list_join:
- ','