Merge pull request #23 from duncangibb/debian-ubuntu-updates

Updates for more recent Debian and Ubuntu packages
veepee-oss · Jun 18, 2020 · 0ba4e43 · 0ba4e43
2 parents e2a3136 + a9018a8
commit 0ba4e43
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -7,6 +7,7 @@
   $service                            = true,
   $enable                             = true,
   $manage_repo                        = true,
+  $split_client_package               = false,
   $apt_location                       = $influxdb::params::apt_location,
   $apt_release                        = $influxdb::params::apt_release,
   $apt_repos                          = $influxdb::params::apt_repos,
@@ -47,6 +48,12 @@
   $graphite_templates                 = $influxdb::params::graphite_templates
 
 ) inherits influxdb::params {
+  case $split_client_package {
+        true    : { $package_names = $influxdb_package_name }
+        false   : { $package_names = [$influxdb_package_name[0]] }
+        default : { fail('split_client_package package must be true (if using Debian/Ubuntu distro packages) or false') }
+      }
+
   case $package {
     true    : { $ensure_package = 'present' }
     false   : { $ensure_package = 'purged' }
@@ -67,17 +74,17 @@
       apt_release           => $apt_release,
       apt_repos             => $apt_repos,
       apt_key               => $apt_key,
-      influxdb_package_name => $influxdb_package_name,
+      influxdb_package_name => $package_names,
       influxdb_service_name => $influxdb_service_name,
     }
 
-    package { $influxdb_package_name[0]:
+    package { $package_names:
       ensure  => $ensure_package,
       require => Class['influxdb::repos'],
     }
   }
   else {
-    package { $influxdb_package_name:
+    package { $package_names:
       ensure  => $ensure_package
     }
   }
@@ -88,7 +95,7 @@
     hasrestart => true,
     hasstatus  => true,
     provider   => $influxdb_service_provider,
-    require    => Package[$influxdb_package_name[0]],
+    require    => Package[$package_names[0]],
   }
 
   if $ensure_service == 'running' {

diff --git a/manifests/repos.pp b/manifests/repos.pp
@@ -13,15 +13,15 @@
   case $::operatingsystem {
     /(?i:debian|devuan|ubuntu)/: {
       case $::lsbdistcodename {
-        /(buster|n\/a)/   : {
+        /(bullseye|n\/a)/   : {
           if !defined(Class['apt']) {
             include apt
           }
 
           apt::source { 'influxdb':
             ensure   => present,
             location => $apt_location,
-            release  => 'jessie',
+            release  => 'buster',
             repos    => 'stable',
             key      => $apt_key,
             notify   => Exec['apt_update']