summaryrefslogtreecommitdiffstats
path: root/manifests/profile
diff options
context:
space:
mode:
authorMichele Baldessari <michele@acksyn.org>2016-10-21 07:44:24 +0200
committerMichele Baldessari <michele@acksyn.org>2016-10-21 08:24:40 +0200
commitebc0c0c8a679643b6a2d0c86944b79d9c95b84fd (patch)
tree0815f8c28a8d5088ff2a5ef6322f6db5b8ea7520 /manifests/profile
parent3031f1c5b17dfdae451d7e16fb60a4f51ab750fa (diff)
Remove the hardcoded tcp_keepalive false parameter
In change I35921652bd84d1d6be0727051294983d4a0dde10 we want to remove all those duplicate tcp_listen_option entries. One consequence of that is that we need to set rabbitmq::tcp_keepalive to true via hiera (as opposed to forcing it via the tcp_listen_option hash). For this to work we need to remove this forced parameter override. Note that even if I35921652bd84d1d6be0727051294983d4a0dde10 and this change don't merge at the exact same time it is still okay because we do force tcp_keepalive to true via the tcp_listen_options. Change-Id: I608477d5714a5081b3b4ab3b9fc2932bdd598301
Diffstat (limited to 'manifests/profile')
-rw-r--r--manifests/profile/base/rabbitmq.pp2
1 files changed, 0 insertions, 2 deletions
diff --git a/manifests/profile/base/rabbitmq.pp b/manifests/profile/base/rabbitmq.pp
index b521999..d90805a 100644
--- a/manifests/profile/base/rabbitmq.pp
+++ b/manifests/profile/base/rabbitmq.pp
@@ -68,7 +68,6 @@ class tripleo::profile::base::rabbitmq (
class { '::rabbitmq':
config_cluster => $manage_service,
cluster_nodes => $nodes,
- tcp_keepalive => false,
config_kernel_variables => $kernel_variables,
config_variables => $config_variables,
environment_variables => $rabbit_env,
@@ -85,7 +84,6 @@ class tripleo::profile::base::rabbitmq (
} else {
# Standard configuration
class { '::rabbitmq':
- tcp_keepalive => false,
config_kernel_variables => $kernel_variables,
config_variables => $config_variables,
environment_variables => $rabbit_env,