Drop support for sysvinit

manifests/params.pp

@@ -5,49 +5,13 @@
 class jira::params {
  Exec { path => ['/bin/', '/sbin/', '/usr/bin/', '/usr/sbin/'] }
 
- case $facts['os']['family'] {
- /RedHat/: {
- if $facts['os']['name'] == 'Amazon' and $facts['os']['release']['major'] =='2018' {
- $json_packages = ['rubygem-json']
- $service_file_location = '/etc/init.d/jira'
- $service_file_template = 'jira/jira.initscript.erb'
- $service_file_mode = '0755'
- $service_lockfile = '/var/lock/subsys/jira'
- $service_provider = undef
- } elsif versioncmp($facts['os']['release']['major'], '7') >= 0 {
- $json_packages = ['rubygem-json']
- $service_file_location = '/usr/lib/systemd/system/jira.service'
- $service_file_template = 'jira/jira.service.erb'
- $service_file_mode = '0644'
- $service_lockfile = '/var/lock/subsys/jira'
- $service_provider = 'systemd'
- } elsif versioncmp($facts['os']['release']['major'], '6') >= 0 {
- $json_packages = ['rubygem-json', 'ruby-json']
- $service_file_location = '/etc/init.d/jira'
- $service_file_template = 'jira/jira.initscript.erb'
- $service_file_mode = '0755'
- $service_lockfile = '/var/lock/subsys/jira'
- $service_provider = undef
- } else {
- fail("\"${module_name}\" provides no service parameters
- for \"${facts['os']['family']}\" - \"${$facts['os']['release']['major']}\"")
- }
- }
- /Debian/: {
- $json_packages = ['ruby-json']
- $service_file_location = '/lib/systemd/system/jira.service'
- $service_file_template = 'jira/jira.service.erb'
- $service_file_mode = '0644'
- $service_lockfile = '/var/lock/subsys/jira'
- $service_provider = 'systemd'
- }
- default: {
- $json_packages = ['rubygem-json', 'ruby-json']
- $service_file_location = '/etc/init.d/jira'
- $service_file_template = 'jira/jira.initscript.erb'
- $service_file_mode = '0755'
- $service_lockfile = '/var/lock/subsys/jira'
- $service_provider = undef
- }
+ $service_file_location = '/usr/lib/systemd/system/jira.service'
+ $service_file_template = 'jira/jira.service.erb'
+ $service_file_mode = '0644'
+
+ $json_packages = $facts['os']['family'] ? {
+ 'RedHat' => ['rubygem-json'],
+ 'Debian' => ['ruby-json'],
+ default => [],
  }
 }

manifests/service.pp

@@ -23,8 +23,6 @@
  $service_file_location = $jira::params::service_file_location,
  $service_file_template = $jira::params::service_file_template,
  $service_file_mode = $jira::params::service_file_mode,
- $service_lockfile = $jira::params::service_lockfile,
- $service_provider = $jira::params::service_provider,
 
 ) inherits jira::params {
  file { $service_file_location:
@@ -33,13 +31,11 @@
  }
 
  if $service_manage {
- if $service_provider == 'systemd' {
- exec { 'refresh_systemd':
- command => 'systemctl daemon-reload',
- refreshonly => true,
- subscribe => File[$service_file_location],
- before => Service['jira'],
- }
+ exec { 'refresh_systemd':
+ command => 'systemctl daemon-reload',
+ refreshonly => true,
+ subscribe => File[$service_file_location],
+ before => Service['jira'],
  }
 
  service { 'jira':
@@ -48,7 +44,6 @@
  require => File[$service_file_location],
  notify => $service_notify,
  subscribe => $service_subscribe,
- provider => $service_provider,
  }
  }
 }

metadata.json

@@ -35,28 +35,24 @@
  {
  "operatingsystem": "RedHat",
  "operatingsystemrelease": [
- "6",
  "7"
  ]
  },
  {
  "operatingsystem": "CentOS",
  "operatingsystemrelease": [
- "6",
  "7"
  ]
  },
  {
  "operatingsystem": "OracleLinux",
  "operatingsystemrelease": [
- "6",
  "7"
  ]
  },
  {
  "operatingsystem": "Scientific",
  "operatingsystemrelease": [
- "6",
  "7"
  ]
  },

spec/classes/jira_service_spec.rb

@@ -15,35 +15,14 @@
  'package { "jdk": }'
  end
 
- case facts[:os]['family']
- when 'RedHat'
- service_file_location = if facts['service_provider'] == 'systemd'
- '/usr/lib/systemd/system/jira.service'
- else
- '/etc/init.d/jira'
- end
- when 'Debian'
- service_file_location = '/lib/systemd/system/jira.service'
- end
-
  context 'with defaults for all parameters' do
  it { is_expected.to compile.with_all_deps }
 
- case facts['service_provider']
- when 'systemd'
- it do
- is_expected.to contain_file(service_file_location).
- with_content(%r{Atlassian Systemd Jira Service})
- end
- it { is_expected.to contain_exec('refresh_systemd') }
- when 'redhat'
- it do
- is_expected.to contain_file(service_file_location).
- with_content(%r{Short-Description: Start up JIRA}).
- with_content(%r{lockfile=/var/lock/subsys/jira})
- end
+ it do
+ is_expected.to contain_file('/lib/systemd/system/jira.service').
+ with_content(%r{Atlassian Systemd Jira Service})
  end
-
+ it { is_expected.to contain_exec('refresh_systemd') }
  it { is_expected.to contain_service('jira') }
  end