Ubuntu15 and systemd support

.fixtures.yml

@@ -2,5 +2,6 @@ fixtures:
   repositories:
     stdlib: git://github.com/puppetlabs/puppetlabs-stdlib.git
     epel: git://github.com/stahnma/puppet-module-epel.git
+    systemd: git://github.com/justin8/justin8-systemd.git
   symlinks:
     diamond: "#{source_dir}"

manifests/config.pp

@@ -20,6 +20,7 @@
   $hostname_method  = $diamond::hostname_method
   $handlers_path    = $diamond::handlers_path
   $rotate_days      = $diamond::rotate_days
+  $collectors_path  = $diamond::collectors_path
   file { '/etc/diamond/diamond.conf':
     ensure  => present,
     content => template('diamond/etc/diamond/diamond.conf.erb'),

manifests/init.pp

@@ -91,6 +91,33 @@
   $purge_collectors  = false,
   $install_from_pip  = false,
 ) {
+  include systemd
+
+  case $::osfamily {
+    'Archlinux': {
+      $diamond_path = '/usr/bin/diamond'
+      $collectors_path = '/usr/share/diamond/collectors/'
+    }
+    'RedHat': {
+      $diamond_path = '/usr/bin/diamond'
+      $collectors_path = '/usr/share/diamond/collectors/'
+    }
+    'Debian': {
+      $diamond_path = '/usr/local/bin/diamond'
+      $collectors_path = '/usr/local/share/diamond/collectors/'
+    }
+    'Solaris': {
+      $diamond_path = '/usr/bin/diamond'
+      $collectors_path = '/usr/share/diamond/collectors/'
+      $provider = undef
+    }
+    default: {
+      $diamond_path = '/usr/bin/diamond'
+      $collectors_path = '/usr/share/diamond/collectors/'
+      $provider = undef
+    }
+  }
+
   class{'diamond::install': } ->
   class{'diamond::config': } ~>
   class{'diamond::service': } ->

manifests/install.pp

@@ -4,6 +4,7 @@
 # Also installed dependencies for collectors
 #
 class diamond::install {
+  $diamond_path = $diamond::diamond_path
 
   if $diamond::install_from_pip {
     case $::osfamily {
@@ -55,12 +56,21 @@
       group   => 'sys',
       require => [Package['diamond'],File['/lib/svc/method/diamond']],
     }
+  }
+
+  if $::systemd_available == 'true' {
+    file { "${::systemd::unit_path}/diamond.service":
+      content => template('diamond/diamond.service.erb'),
+      before  => Service['diamond'],
+      notify  => Exec['systemd-daemon-reload'],
+    }
   } else {
     file { '/etc/init.d/diamond':
       mode    => '0755',
       require => Package['diamond'],
     }
   }
+
   file { '/var/log/diamond':
     ensure => directory,
   }

manifests/service.pp

@@ -12,8 +12,14 @@
     'Solaris' => '/lib/svc/manifest/network/diamond.xml',
     default   => undef,
   }
+  $provider = $::systemd_available ? {
+    'true'  => 'systemd',
+    default => undef,
+  }
+
   service { 'diamond':
     ensure     => $ensure,
+    provider   => $provider,
     name       => $service_name,
     enable     => $diamond::enable,
     hasstatus  => true,

metadata.json

@@ -31,6 +31,8 @@
       "operatingsystemrelease": [
         "5.11"
       ]
+    },{
+      "operatingsystem": "Archlinux"
     }
   ],
   "requirements": [
@@ -47,6 +49,10 @@
     {
       "name": "puppetlabs/stdlib",
       "version_requirement": ">= 4.2.0"
+    },
+    {
+      "name": "justin8/systemd",
+      "version_requirement": "> 0.0.1 <= 1.0.0"
     }
   ]
 }

spec/classes/diamond/diamond_spec.rb

@@ -157,9 +157,22 @@
     it { should contain_file('/var/log/diamond')}
   end
 
+  context 'with enabling pip installation on RedHat with systemd' do
+    let (:params) { {'install_from_pip' => true} }
+    let (:facts) { {
+      :osfamily => 'RedHat',
+      :systemd_available => 'true',
+    } }
+    # All other checks should be the exact same as without systemd
+    it { should contain_file('/usr/lib/systemd/system/diamond.service')}
+  end
+
   context 'with enabling pip installation on Debian' do
     let (:params) { {'install_from_pip' => true} }
-    let (:facts) { {:osfamily => 'Debian'} }
+    let (:facts) { {
+      :osfamily => 'Debian',
+      :operatingsystem => 'Debian',
+    } }
     it { should contain_package('python-pip').that_comes_before('Package[diamond]')}
     it { should contain_package('python-configobj').that_comes_before('Package[diamond]')}
     it { should contain_package('gcc').that_comes_before('Package[diamond]')}
@@ -173,9 +186,23 @@
     it { should contain_file('/var/log/diamond')}
   end
 
+  context 'with enabling pip installation on Debian with systemd' do
+    let (:params) { {'install_from_pip' => true} }
+    let (:facts) { {
+      :osfamily => 'Debian',
+      :operatingsystem => 'Debian',
+      :systemd_available => 'true',
+    } }
+    # All other checks should be the exact same as without systemd
+    it { should contain_file('/lib/systemd/system/diamond.service')}
+  end
+
   context 'with enabling pip installation on Ubuntu' do
     let (:params) { {'install_from_pip' => true} }
-    let (:facts) { {:osfamily => 'Ubuntu'} }
+    let (:facts) { {
+      :osfamily => 'Debian',
+      :operatingsystem => 'Ubuntu',
+    } }
     it { should contain_package('python-pip').that_comes_before('Package[diamond]')}
     it { should contain_package('python-configobj').that_comes_before('Package[diamond]')}
     it { should contain_package('gcc').that_comes_before('Package[diamond]')}
@@ -189,6 +216,17 @@
     it { should contain_file('/var/log/diamond')}
   end
 
+  context 'with enabling pip installation on Ubuntu with systemd' do
+    let (:params) { {'install_from_pip' => true} }
+    let (:facts) { {
+      :osfamily => 'Debian',
+      :operatingsystem => 'Ubuntu',
+      :systemd_available => 'true',
+    } }
+    # All other checks should be the exact same as without systemd
+    it { should contain_file('/lib/systemd/system/diamond.service')}
+  end
+
   context 'with enabling pip installation on Solaris' do
     let (:params) { {'install_from_pip' => true} }
     let (:facts) { {:osfamily => 'Solaris', :operatingsystemrelease => '5.11'} }

templates/diamond.service.erb

@@ -0,0 +1,9 @@
+[Unit]
+Description=Diamond daemon
+After=network.target
+
+[Service]
+ExecStart=<%= @diamond_path %> --foreground
+
+[Install]
+WantedBy=multi-user.target

templates/etc/diamond/diamond.conf.erb

@@ -33,7 +33,7 @@ group =
 pid_file = /var/run/diamond.pid
 
 # Directory to load collector modules from
-collectors_path = /usr/share/diamond/collectors/
+collectors_path = <%= @collectors_path %>
 
 # Directory to load collector configs from
 collectors_config_path = /etc/diamond/collectors/