Merge "Fixup the memcached servers string in nova.conf for v6"
This commit is contained in:
commit
bb05fa304a
@ -139,6 +139,14 @@ resources:
|
|||||||
list_join:
|
list_join:
|
||||||
- "','"
|
- "','"
|
||||||
- {get_param: memcache_node_ips}
|
- {get_param: memcache_node_ips}
|
||||||
|
memcache_node_ips_v6:
|
||||||
|
str_replace:
|
||||||
|
template: "['inet6:[SERVERS_LIST]']"
|
||||||
|
params:
|
||||||
|
SERVERS_LIST:
|
||||||
|
list_join:
|
||||||
|
- "]','inet6:["
|
||||||
|
- {get_param: memcache_node_ips}
|
||||||
mysql_node_ips:
|
mysql_node_ips:
|
||||||
str_replace:
|
str_replace:
|
||||||
template: "['SERVERS_LIST']"
|
template: "['SERVERS_LIST']"
|
||||||
|
@ -628,8 +628,15 @@ if hiera('step') >= 3 {
|
|||||||
include ::glance::notify::rabbitmq
|
include ::glance::notify::rabbitmq
|
||||||
include join(['::glance::backend::', $glance_backend])
|
include join(['::glance::backend::', $glance_backend])
|
||||||
|
|
||||||
|
$nova_ipv6 = hiera('nova::use_ipv6', false)
|
||||||
|
if $nova_ipv6 {
|
||||||
|
$memcached_servers = suffix(hiera('memcache_node_ips_v6'), ':11211')
|
||||||
|
} else {
|
||||||
|
$memcached_servers = suffix(hiera('memcache_node_ips'), ':11211')
|
||||||
|
}
|
||||||
|
|
||||||
class { '::nova' :
|
class { '::nova' :
|
||||||
memcached_servers => suffix(hiera('memcache_node_ips'), ':11211'),
|
memcached_servers => $memcached_servers
|
||||||
}
|
}
|
||||||
|
|
||||||
include ::nova::config
|
include ::nova::config
|
||||||
|
Loading…
Reference in New Issue
Block a user