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 "Adds OpenDaylight composable 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
793b17d
..
ddde549
100644
(file)
--- a/
puppet/all-nodes-config.yaml
+++ b/
puppet/all-nodes-config.yaml
@@
-56,6
+56,8
@@
parameters:
type: comma_delimited_list
ceph_mon_node_names:
type: comma_delimited_list
type: comma_delimited_list
ceph_mon_node_names:
type: comma_delimited_list
+ opendaylight_api_node_ips:
+ type: comma_delimited_list
DeployIdentifier:
type: string
description: >
DeployIdentifier:
type: string
description: >
@@
-104,7
+106,7
@@
resources:
list_join:
- ','
- {get_param: controller_names}
list_join:
- ','
- {get_param: controller_names}
- rabbit_node_ips: &rabbit_nodes_array
+ rabbit
mq
_node_ips: &rabbit_nodes_array
str_replace:
template: "['SERVERS_LIST']"
params:
str_replace:
template: "['SERVERS_LIST']"
params:
@@
-112,7
+114,7
@@
resources:
list_join:
- "','"
- {get_param: rabbit_node_ips}
list_join:
- "','"
- {get_param: rabbit_node_ips}
- mongo_node_ips:
+ mongo
db
_node_ips:
str_replace:
template: "['SERVERS_LIST']"
params:
str_replace:
template: "['SERVERS_LIST']"
params:
@@
-128,7
+130,7
@@
resources:
list_join:
- "','"
- {get_param: redis_node_ips}
list_join:
- "','"
- {get_param: redis_node_ips}
- memcache_node_ips:
+ memcache
d
_node_ips:
str_replace:
template: "['SERVERS_LIST']"
params:
str_replace:
template: "['SERVERS_LIST']"
params:
@@
-136,7
+138,7
@@
resources:
list_join:
- "','"
- {get_param: memcache_node_ips}
list_join:
- "','"
- {get_param: memcache_node_ips}
- memcache_node_ips_v6:
+ memcache
d
_node_ips_v6:
str_replace:
template: "['inet6:[SERVERS_LIST]']"
params:
str_replace:
template: "['inet6:[SERVERS_LIST]']"
params:
@@
-297,7
+299,14
@@
resources:
list_join:
- "','"
- {get_param: ironic_api_node_ips}
list_join:
- "','"
- {get_param: ironic_api_node_ips}
-
+ opendaylight_api_node_ips:
+ str_replace:
+ template: "['SERVERS_LIST']"
+ params:
+ SERVERS_LIST:
+ list_join:
+ - "','"
+ - {get_param: opendaylight_api_node_ips}
tripleo::profile::base::ceph::ceph_mon_initial_members:
list_join:
- ','
tripleo::profile::base::ceph::ceph_mon_initial_members:
list_join:
- ','