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 "horizon/keystone api should use internal_api NW"
[apex-tripleo-heat-templates.git]
/
puppet
/
manifests
/
overcloud_controller.pp
diff --git
a/puppet/manifests/overcloud_controller.pp
b/puppet/manifests/overcloud_controller.pp
index
ac76532
..
9316ae1
100644
(file)
--- a/
puppet/manifests/overcloud_controller.pp
+++ b/
puppet/manifests/overcloud_controller.pp
@@
-48,8
+48,7
@@
if hiera('step') >= 2 {
include ::mongodb::globals
include ::mongodb::server
include ::mongodb::globals
include ::mongodb::server
- $mongo_node_ips = split(hiera('mongo_node_ips'), ',')
- $mongo_node_ips_with_port = suffix($mongo_node_ips, ':27017')
+ $mongo_node_ips_with_port = suffix(hiera('mongo_node_ips'), ':27017')
$mongo_node_string = join($mongo_node_ips_with_port, ',')
$mongodb_replset = hiera('mongodb::server::replset')
$mongo_node_string = join($mongo_node_ips_with_port, ',')
$mongodb_replset = hiera('mongodb::server::replset')
@@
-62,7
+61,7
@@
if hiera('step') >= 2 {
}
# Redis
}
# Redis
- $redis_node_ips =
split(hiera('redis_node_ips'), ',
')
+ $redis_node_ips =
hiera('redis_node_ips
')
$redis_master_hostname = downcase(hiera('bootstrap_nodeid'))
if $redis_master_hostname == $::hostname {
$redis_master_hostname = downcase(hiera('bootstrap_nodeid'))
if $redis_master_hostname == $::hostname {
@@
-418,7
+417,7
@@
if hiera('step') >= 3 {
# Horizon
$vhost_params = { add_listen => false }
class { 'horizon':
# Horizon
$vhost_params = { add_listen => false }
class { 'horizon':
- cache_server_ip =>
split(hiera('memcache_node_ips', '127.0.0.1'), ',
'),
+ cache_server_ip =>
hiera('memcache_node_ips', '127.0.0.1
'),
vhost_extra_params => $vhost_params,
}
vhost_extra_params => $vhost_params,
}