From cfd2206e8b1888713f2fdb8fd4b905a0dc5e6944 Mon Sep 17 00:00:00 2001 From: Christopher Pepe Date: Wed, 27 Feb 2019 14:10:53 -0500 Subject: [PATCH 1/3] updated logic for better amazon support --- manifests/params.pp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/manifests/params.pp b/manifests/params.pp index ad4f4cf0..ed7835ad 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -8,13 +8,19 @@ case $facts['osfamily'] { /RedHat/: { - if versioncmp($facts['operatingsystemmajrelease'], '7') >= 0 { + if $facts['operatingsystem'] == 'Amazon' and $facts['operatingsystemmajrelease'] =='2018' { + $json_packages = [ 'rubygem-json', 'ruby-json' ] + $service_file_location = '/etc/init.d/jira' + $service_file_template = 'jira/jira.initscript.erb' + $service_lockfile = '/var/lock/subsys/jira' + $service_provider = undef + } elseif versioncmp($facts['operatingsystemmajrelease'], '7') >= 0 { $json_packages = [ 'rubygem-json' ] $service_file_location = '/usr/lib/systemd/system/jira.service' $service_file_template = 'jira/jira.service.erb' $service_lockfile = '/var/lock/subsys/jira' $service_provider = 'systemd' - } elsif versioncmp($facts['operatingsystemmajrelease'], '6') >= 0 or $facts['operatingsystem'] == 'Amazon' { + } elsif versioncmp($facts['operatingsystemmajrelease'], '6') >= 0 { $json_packages = [ 'rubygem-json', 'ruby-json' ] $service_file_location = '/etc/init.d/jira' $service_file_template = 'jira/jira.initscript.erb' From 310ae6681a18313dccc417a45793273110991255 Mon Sep 17 00:00:00 2001 From: Christopher Pepe Date: Wed, 27 Feb 2019 14:20:15 -0500 Subject: [PATCH 2/3] that's not how you do else if --- manifests/params.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/params.pp b/manifests/params.pp index ed7835ad..96b58977 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -14,7 +14,7 @@ $service_file_template = 'jira/jira.initscript.erb' $service_lockfile = '/var/lock/subsys/jira' $service_provider = undef - } elseif versioncmp($facts['operatingsystemmajrelease'], '7') >= 0 { + } elsif versioncmp($facts['operatingsystemmajrelease'], '7') >= 0 { $json_packages = [ 'rubygem-json' ] $service_file_location = '/usr/lib/systemd/system/jira.service' $service_file_template = 'jira/jira.service.erb' From 36d77f9dab1dc9daebea05fa7b3ed04d2a9e3f65 Mon Sep 17 00:00:00 2001 From: Christopher Pepe Date: Wed, 27 Feb 2019 14:23:32 -0500 Subject: [PATCH 3/3] removed ruby-json as it throws errors for being set to purge --- manifests/params.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/params.pp b/manifests/params.pp index 96b58977..91e8e3cc 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -9,7 +9,7 @@ case $facts['osfamily'] { /RedHat/: { if $facts['operatingsystem'] == 'Amazon' and $facts['operatingsystemmajrelease'] =='2018' { - $json_packages = [ 'rubygem-json', 'ruby-json' ] + $json_packages = [ 'rubygem-json' ] $service_file_location = '/etc/init.d/jira' $service_file_template = 'jira/jira.initscript.erb' $service_lockfile = '/var/lock/subsys/jira'