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 "add heat-api-cfn to endpoint map"
[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
fed9dd3
..
b065ddd
100644
(file)
--- a/
puppet/all-nodes-config.yaml
+++ b/
puppet/all-nodes-config.yaml
@@
-44,6
+44,8
@@
parameters:
type: comma_delimited_list
glance_registry_node_ips:
type: comma_delimited_list
type: comma_delimited_list
glance_registry_node_ips:
type: comma_delimited_list
+ gnocchi_api_node_ips:
+ type: comma_delimited_list
cinder_api_node_ips:
type: comma_delimited_list
neutron_api_node_ips:
cinder_api_node_ips:
type: comma_delimited_list
neutron_api_node_ips:
@@
-65,6
+67,12
@@
parameters:
description: >
Setting to a previously unused value during stack-update will trigger
package update on all nodes
description: >
Setting to a previously unused value during stack-update will trigger
package update on all nodes
+ StackAction:
+ type: string
+ description: >
+ Heat action on performed top-level stack.
+ constraints:
+ - allowed_values: ['CREATE', 'UPDATE']
resources:
resources:
@@
-197,6
+205,14
@@
resources:
list_join:
- "','"
- {get_param: aodh_api_node_ips}
list_join:
- "','"
- {get_param: aodh_api_node_ips}
+ gnocchi_api_node_ips:
+ str_replace:
+ template: "['SERVERS_LIST']"
+ params:
+ SERVERS_LIST:
+ list_join:
+ - "','"
+ - {get_param: gnocchi_api_node_ips}
nova_api_node_ips:
str_replace:
template: "['SERVERS_LIST']"
nova_api_node_ips:
str_replace:
template: "['SERVERS_LIST']"
@@
-293,6
+309,7
@@
resources:
deploy_identifier: {get_param: DeployIdentifier}
update_identifier: {get_param: UpdateIdentifier}
deploy_identifier: {get_param: DeployIdentifier}
update_identifier: {get_param: UpdateIdentifier}
+ stack_action: {get_param: StackAction}
outputs:
config_id:
outputs:
config_id: