From: Giulio Fidente <gfidente@redhat.com>
Date: Wed, 1 Jun 2016 20:09:18 +0000 (+0200)
Subject: Apply RabbitMQ rabbitmq_* static hiera in nonha with single controller
X-Git-Tag: opnfv-6.0.0~753
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=0edb6855960f4f0b039206758926f312a9ec6a7a;p=apex-puppet-tripleo.git

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
---

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,
+      }
     }
   }