From d381194b93868567db03119d5104c24a9e502f90 Mon Sep 17 00:00:00 2001
From: Michael Krotscheck <krotscheck@gmail.com>
Date: Wed, 27 Jan 2016 08:00:03 -0800
Subject: [PATCH] Added conditional statements for installed packages

Packages required to use this module may also be declared
in downstream manifests. This patch adds necessary if conditions,
to ensure these do not cause conflicts.

Change-Id: I3c1b6cbd5743a8331752bfe4dcb33267ddcf840d
---
 manifests/client.pp | 38 +++++++++++++++++++++++++++-----------
 1 file changed, 27 insertions(+), 11 deletions(-)

diff --git a/manifests/client.pp b/manifests/client.pp
index 2a2c087..36b3443 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -27,18 +27,34 @@ class openafs::client (
   if ($::osfamily == 'RedHat') {
     $openafs_path = '/usr/vice/etc'
 
-    $dkms_packages = [
-      'kernel-devel',
-      'dkms',
-      'gcc'
-    ]
+    if ! defined(Package['kernel-devel']) {
+      package { 'kernel-devel':
+        ensure => present,
+        before => [
+          Package['openafs-client'],
+          Package['openafs-krb5'],
+        ],
+      }
+    }
 
-    package { $dkms_packages:
-      ensure => present,
-      before => [
-        Package['openafs-client'],
-        Package['openafs-krb5'],
-      ],
+    if ! defined(Package['dkms']) {
+      package { 'dkms':
+        ensure => present,
+        before => [
+          Package['openafs-client'],
+          Package['openafs-krb5'],
+        ],
+      }
+    }
+
+    if ! defined(Package['gcc']) {
+      package { 'gcc':
+        ensure => present,
+        before => [
+          Package['openafs-client'],
+          Package['openafs-krb5'],
+        ],
+      }
     }
 
     package { 'dkms-openafs':