Merge pull request #40 from m0dular/aph/debian-repo

Aph/debian repo

Author: m0dular

.fixtures.yml

@@ -5,6 +5,7 @@ fixtures:
   forge_modules:
     archive: "puppet/archive"
     yumrepo: "puppetlabs/yumrepo_core"
+    apt: "puppetlabs/apt"
   repositories:
     facts: 'https://github.com/puppetlabs/puppetlabs-facts'
     puppet_agent: 'https://github.com/puppetlabs/puppetlabs-puppet_agent'

data/common.yaml

@@ -3,4 +3,6 @@ influxdb::host: "%{facts.fqdn}"
 influxdb::port: 8086
 influxdb::initial_org: 'puppetlabs'
 influxdb::initial_bucket: 'puppet_data'
+influxdb::repo_gpg_key_id: '05CE15085FC09D18E99EFB22684A14CF2582E0C5'
 influxdb::repo_gpg_key_url: 'https://repos.influxdata.com/influxdb2.key https://repos.influxdata.com/influxdb.key'
+influxdb::manage_repo: false

data/os/Debian.yaml

@@ -0,0 +1,4 @@
+influxdb::repo_url: 'https://repos.influxdata.com/debian'
+influxdb::manage_repo: true
+influxdb::repo_gpg_key_url: 'https://repos.influxdata.com/influxdb.key'
+influxdb::version: latest

data/os/RedHat.yaml

@@ -1,2 +1,3 @@
 ---
 influxdb::repo_url: 'https://repos.influxdata.com/rhel/$releasever/$basearch/stable'
+influxdb::manage_repo: true

data/os/Ubuntu.yaml

@@ -0,0 +1 @@
+influxdb::repo_url: 'https://repos.influxdata.com/debian'

hiera.yaml

@@ -9,7 +9,6 @@ hierarchy:
   - name: "osfamily/major release"
     paths:
         # Used to distinguish between Debian and Ubuntu
-      - "os/%{facts.os.name}.yaml"
       - "os/%{facts.os.name}/%{facts.os.release.major}.yaml"
       - "os/%{facts.os.family}/%{facts.os.release.major}.yaml"
         # Used for Solaris

manifests/init.pp

@@ -43,6 +43,8 @@
 # @param token_file
 #   File on disk containing an administrative token.  This class will write the token generated as part of initial setup to this file.
 #   Note that functions or code run in Puppet server will not be able to use this file, so setting $token after setup is recommended.
+# @param repo_gpg_key_id
+#   ID of the GPG signing key
 # @param repo_url 
 #   URL of the Package repository
 # @param repo_gpg_key_url
@@ -53,9 +55,10 @@
   Integer $port,
   String  $initial_org,
   String  $initial_bucket,
+  String  $repo_gpg_key_id,
   String  $repo_gpg_key_url,
+  Boolean $manage_repo,
 
-  Boolean $manage_repo = true,
   Boolean $manage_setup = true,
 
   Optional[String] $repo_url = undef,
@@ -81,8 +84,19 @@
     fail("Unable to manage InfluxDB installation on host ${facts['networking']['fqdn']}")
   }
 
+  # If managing SSL, install the package before managing files under /etc/influxdb in order to ensure the directory exists
+  $package_before = if $use_ssl and $manage_ssl {
+    [
+      File['/etc/influxdb/cert.pem', '/etc/influxdb/key.pem', '/etc/influxdb/ca.pem', '/etc/systemd/system/influxdb.service.d'],
+      Service['influxdb']
+    ]
+  }
+  else {
+    Service['influxdb']
+  }
+
   # If we are managing the repository, set it up and install the package with a require on the repo
-  if $manage_repo and $facts['os']['family'] in ['Redhat'] {
+  if $manage_repo {
     #TODO: other distros
     case $facts['os']['family'] {
       'RedHat': {
@@ -96,6 +110,22 @@
           gpgcheck => '1',
           target   => '/etc/yum.repos.d/influxdb2.repo',
         }
+        $package_require = Yumrepo[$repo_name]
+      }
+      'Debian': {
+        include apt
+        apt::source { $repo_name:
+          ensure   => 'present',
+          comment  => 'The InfluxDB2 repository',
+          location => $repo_url,
+          release  => 'stable',
+          repos    => 'main',
+          key      => {
+            'id'     => $repo_gpg_key_id,
+            'source' => $repo_gpg_key_url,
+          },
+        }
+        $package_require = Apt::Source[$repo_name]
       }
       default: {
         notify { 'influxdb_repo_warn':
@@ -105,10 +135,10 @@
       }
     }
 
-    package { 'influxdb2':
+    package {'influxdb2':
       ensure  => $version,
-      require => Yumrepo[$repo_name],
-      before  => Service['influxdb'],
+      require => $package_require,
+      before  => $package_before,
     }
   }
   # If not managing the repo, install the package from archive source
@@ -167,7 +197,7 @@
   else {
     package { 'influxdb2':
       ensure => installed,
-      before => Service['influxdb'],
+      before => $package_before,
     }
   }
 

metadata.json

@@ -8,7 +8,11 @@
   "dependencies": [
     {
       "name": "puppet/archive",
-      "version_requirement": ">= 6.0.0 <7.0"
+      "version_requirement": ">= 6.0.0 <7.0.0"
+    },
+    {
+      "name": "puppetlabs/apt",
+      "version_requirement": ">= 9.0.0 <10.0.0"
     }
   ],
   "operatingsystem_support": [

spec/classes/init_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'pry'
 
 describe 'influxdb' do
   let(:facts) { { os: { family: 'RedHat' }, identity: { user: 'root' } } }
@@ -25,6 +26,13 @@
       )
 
       is_expected.to contain_service('influxdb').with_ensure('running')
+      is_expected.to contain_package('influxdb2').that_comes_before([
+                                                                      'File[/etc/influxdb/cert.pem]',
+                                                                      'File[/etc/influxdb/key.pem]',
+                                                                      'File[/etc/influxdb/ca.pem]',
+                                                                      'File[/etc/systemd/system/influxdb.service.d]',
+                                                                      'Service[influxdb]',
+                                                                    ])
       is_expected.to contain_package('influxdb2').with_ensure('2.1.1')
 
       ['/etc/influxdb/cert.pem', '/etc/influxdb/ca.pem', '/etc/influxdb/key.pem'].each do |file|