Use rabbitmq ipv6 flag
The internal details of enabling IPv6 have moved upstream[1], so just
set the ipv6 flag when desired and don't worry about the details
anymore!
[1] https://github.com/puppetlabs/puppetlabs-rabbitmq/pull/552
Closes-Bug: #1710658
Change-Id: Ib22507c4d02f0fae5c0189ab7e040efac3df7e2f
(cherry picked from commit 3a5eb08d58
)
This commit is contained in:
parent
8ffd426aaf
commit
5ca2ec88ce
|
@ -72,15 +72,6 @@ class tripleo::profile::base::rabbitmq (
|
|||
$stack_action = hiera('stack_action'),
|
||||
$step = hiera('step'),
|
||||
) {
|
||||
# IPv6 environment, necessary for RabbitMQ.
|
||||
if $ipv6 {
|
||||
$rabbit_env = merge($environment, {
|
||||
'RABBITMQ_SERVER_START_ARGS' => '"-proto_dist inet6_tcp"',
|
||||
'RABBITMQ_CTL_ERL_ARGS' => '"-proto_dist inet6_tcp"'
|
||||
})
|
||||
} else {
|
||||
$rabbit_env = $environment
|
||||
}
|
||||
if $inet_dist_interface {
|
||||
$real_kernel_variables = merge(
|
||||
$kernel_variables,
|
||||
|
@ -99,7 +90,8 @@ class tripleo::profile::base::rabbitmq (
|
|||
cluster_nodes => $nodes,
|
||||
config_kernel_variables => $real_kernel_variables,
|
||||
config_variables => $config_variables,
|
||||
environment_variables => $rabbit_env,
|
||||
environment_variables => $environment,
|
||||
ipv6 => $ipv6,
|
||||
}
|
||||
# when running multi-nodes without Pacemaker
|
||||
if $manage_service {
|
||||
|
@ -115,7 +107,8 @@ class tripleo::profile::base::rabbitmq (
|
|||
class { '::rabbitmq':
|
||||
config_kernel_variables => $kernel_variables,
|
||||
config_variables => $config_variables,
|
||||
environment_variables => $rabbit_env,
|
||||
environment_variables => $environment,
|
||||
ipv6 => $ipv6,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue