summaryrefslogtreecommitdiffstats
path: root/manifests/profile/base
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-10-19 00:21:18 +0000
committerGerrit Code Review <review@openstack.org>2016-10-19 00:21:18 +0000
commit3031f1c5b17dfdae451d7e16fb60a4f51ab750fa (patch)
treecc5311669fb21020db8ea2e5995fd32dc0c23422 /manifests/profile/base
parent15c70b7a376e2b3a3055921e3509fb19fd740bfe (diff)
parent3fe6889fed9638baa9b658cd5c704a66a50929aa (diff)
Merge "Fix broken rabbitmqctl commands when using ipv6"
Diffstat (limited to 'manifests/profile/base')
-rw-r--r--manifests/profile/base/rabbitmq.pp3
1 files changed, 2 insertions, 1 deletions
diff --git a/manifests/profile/base/rabbitmq.pp b/manifests/profile/base/rabbitmq.pp
index 2fd2347..b521999 100644
--- a/manifests/profile/base/rabbitmq.pp
+++ b/manifests/profile/base/rabbitmq.pp
@@ -54,7 +54,8 @@ class tripleo::profile::base::rabbitmq (
# IPv6 environment, necessary for RabbitMQ.
if $ipv6 {
$rabbit_env = merge($environment, {
- 'RABBITMQ_SERVER_START_ARGS' => '"-proto_dist inet6_tcp"'
+ 'RABBITMQ_SERVER_START_ARGS' => '"-proto_dist inet6_tcp"',
+ 'RABBITMQ_CTL_ERL_ARGS' => '"-proto_dist inet6_tcp"'
})
} else {
$rabbit_env = $environment