From c8584228e8055b9b0e71381f70717fbd1310218e Mon Sep 17 00:00:00 2001
From: Peter Souter <peter.souter+GIT@puppet.com>
Date: Wed, 3 May 2017 16:46:44 +0100
Subject: [PATCH] Adds logic for managing redis-sentinel package

* redis-sentinel is present in upstream repos
* It's also present for 16.04/xenial onwards
* So lets only manage that package if we're on
Ubuntu newer or if we're managing the repo
---
 manifests/sentinel.pp | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/manifests/sentinel.pp b/manifests/sentinel.pp
index 522f2ab4..d9c5de0d 100644
--- a/manifests/sentinel.pp
+++ b/manifests/sentinel.pp
@@ -192,11 +192,14 @@
 
   require ::redis
 
-  # Debian flavour machines have a dedicated redis-sentinel package
-  # See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=775414 for context
   if $::osfamily == 'Debian' {
-    package { $package_name:
-      ensure => $package_ensure,
+    # Debian flavour machines have a dedicated redis-sentinel package
+    # This is default in Xenial onwards, unstable debian or PPA/other upstream
+    # See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=775414 for context
+    if (versioncmp($::operatingsystemmajrelease, '16.04') >= 0 or $::redis::manage_repo) {
+      package { $package_name:
+        ensure => $package_ensure,
+      }
     }
   }