Adds systemd support

README.markdown

@@ -8,7 +8,7 @@
 * Installs the consul daemon (via url or package)
 * Optionally installs a user to run it under
 * Installs a configuration file (/etc/consul/config.json)
-* Manages the consul service via upstart
+* Manages the consul service via upstart, sysv, or systemd
 
 ##Usage
 
@@ -31,9 +31,7 @@ class { 'consul':
 
 ##Limitations
 
-This module requires upstart to manage the service. Patches welcome! (with tests)
-
-Also it depends on the JSON gem, or a modern ruby.
+Depends on the JSON gem, or a modern ruby.
 
 ##Development
 Open an [issue](https://github.com/solarkennedy/puppet-consul/issues) or 

manifests/install.pp

@@ -37,12 +37,20 @@
         content => template('consul/consul.upstart.erb'),
       }
     }
-    'redhat' : {
+    'systemd' : {
+      file { '/lib/systemd/system/consul.service':
+        mode   => '0644',
+        owner   => 'root',
+        group   => 'root',
+        content => template('consul/consul.systemd.erb'),
+      }
+    }
+    'sysv' : {
       file { '/etc/init.d/consul':
         mode    => '0555',
         owner   => 'root',
         group   => 'root',
-        content => template('consul/consul.redhat.erb')
+        content => template('consul/consul.sysv.erb')
       }
     }
     'debian' : {

manifests/params.pp

@@ -22,9 +22,15 @@
       /(10|12|14)\.04/ => 'upstart',
       default => undef
     },
+    /CentOS|RedHat/      => $::operatingsystemmajrelease ? {
+      /(4|5|6)/ => 'sysv',
+      default   => 'systemd',
+    },
+    'Fedora'             => $::operatingsystemmajrelease ? {
+      /(12|13|14)/ => 'sysv',
+      default      => 'systemd',
+    },
     'Debian'             => 'debian',
-    'CentOS'             => 'redhat',
-    'RedHat'             => 'redhat',
     default => undef
   }
 }

spec/classes/init_spec.rb

@@ -77,15 +77,36 @@
     it { should contain_file('/etc/init/consul.conf').with_content(/sudo -u custom_consul_user -g custom_consul_group/) }
   end
 
-  context "On a redhat-based OS" do
+  context "On a redhat 6 based OS" do
     let(:facts) {{
-      :operatingsystem => 'CentOS'
+      :operatingsystem => 'CentOS',
+      :operatingsystemmajrelease => 6,
     }}
 
-    it { should contain_class('consul').with_init_style('redhat') }
+    it { should contain_class('consul').with_init_style('sysv') }
     it { should contain_file('/etc/init.d/consul').with_content(/daemon --user=consul/) }
   end
 
+  context "On a redhat 7 based OS" do
+    let(:facts) {{
+      :operatingsystem => 'CentOS',
+      :operatingsystemmajrelease => 7,
+    }}
+
+    it { should contain_class('consul').with_init_style('systemd') }
+    it { should contain_file('/lib/systemd/system/consul.service').with_content(/consul agent/) }
+  end
+
+  context "On a fedora 20 based OS" do
+    let(:facts) {{
+      :operatingsystem => 'Fedora',
+      :operatingsystemmajrelease => 20,
+    }}
+
+    it { should contain_class('consul').with_init_style('systemd') }
+    it { should contain_file('/lib/systemd/system/consul.service').with_content(/consul agent/) }
+  end
+
   context "On hardy" do
     let(:facts) {{
       :operatingsystem => 'Ubuntu',

templates/consul.systemd.erb

@@ -0,0 +1,17 @@
+[Unit]
+Description=Consul Agent
+Wants=basic.target
+After=basic.target network.target
+
+[Service]
+User=<%= scope.lookupvar('consul::user') %>
+Group=<%= scope.lookupvar('consul::group') %>
+ExecStart=<%= scope.lookupvar('consul::bin_dir') %>/consul agent \
+  -config-dir <%= scope.lookupvar('consul::config_dir') %> <%= scope.lookupvar('consul::extra_options') %>
+ExecReload=/bin/kill -HUP $MAINPID
+KillMode=process
+Restart=on-failure
+RestartSec=42s
+
+[Install]
+WantedBy=multi-user.target