From 79ef1654772009b66127d857e0dc09d52fdf107b Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Thu, 18 Oct 2018 11:38:47 -0700
Subject: [PATCH] Install statsd version 2.1.2

The logstash log processing and subunit2sql tooling is often paired
together on servers. Currently subunit2sql depends on
os-performance-tools which depend on statsd<3.0. That means our package
resource here for statsd that tried to install latest conflicts with our
usage of subunit2sql on the same server.

Avoid this conflict by installing 2.1.2 for geard and then subunit2sql
will be happy too.

Change-Id: I3ac04cb93025ae2e2115ed23ba4927c2060f6dc8
---
 manifests/init.pp | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index 4a09f3e..a85de7a 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -71,11 +71,20 @@ class log_processor (
     require  => Class['pip'],
   }
 
-  package { 'statsd':
-    ensure   => latest,
-    provider => openstack_pip,
-    require  => Class['pip'],
+  if ! defined(Package['statsd']) {
+    package { 'statsd':
+      # NOTE(cmurphy) If this is not pinned, the openstack_pip provider will
+      # attempt to install latest and conflict with the <3 cap from
+      # os-performance-tools. Unpin this when os-performance-tools raises its
+      # cap.
+      # NOTE (clarkb) we also install it here because geard can report stats
+      # with statsd so need it even if subunit2sql is not used.
+      ensure   => '2.1.2',
+      provider => openstack_pip,
+      require  => Class['pip']
+    }
   }
+
   # Temporarily pin paho-mqtt to 1.2.3 since 1.3.0 won't support TLS on
   # Trusty's Python 2.7.
   if ! defined(Package['paho-mqtt']) {