summaryrefslogtreecommitdiffstats
path: root/manifests
diff options
context:
space:
mode:
authorGiulio Fidente <gfidente@redhat.com>2016-06-01 22:09:18 +0200
committerEmilien Macchi <emilien@redhat.com>2016-06-02 12:30:51 +0000
commit0edb6855960f4f0b039206758926f312a9ec6a7a (patch)
treeef55f5e9ed1d3c4ff57a16f1bc4034256be11ca6 /manifests
parentdf484b57dbdc75abd2654aebde95c59bc7dae3c5 (diff)
Apply RabbitMQ rabbitmq_* static hiera in nonha with single controller
We were not consuming the rabbitmq_* static hiera settings when deploying without pcmk and with a single controller. Change-Id: I1506093e3d4365e2617521737c8f53edfb022133
Diffstat (limited to 'manifests')
-rw-r--r--manifests/profile/base/rabbitmq.pp7
1 files changed, 6 insertions, 1 deletions
diff --git a/manifests/profile/base/rabbitmq.pp b/manifests/profile/base/rabbitmq.pp
index e67d71a..6e86eab 100644
--- a/manifests/profile/base/rabbitmq.pp
+++ b/manifests/profile/base/rabbitmq.pp
@@ -84,7 +84,12 @@ class tripleo::profile::base::rabbitmq (
}
} else {
# Standard configuration
- include ::rabbitmq
+ class { '::rabbitmq':
+ tcp_keepalive => false,
+ config_kernel_variables => $kernel_variables,
+ config_variables => $config_variables,
+ environment_variables => $rabbit_env,
+ }
}
}