remove jira::facts and simplify install/upgrade logic

Also test upgrade in acceptance

Author: oranenj

README.md

@@ -102,15 +102,13 @@ Note that there's no smarts here. You need to set javahome correctly.
 Jira can be upgraded by incrementing this version number. This will *STOP* the
 running instance of Jira and attempt to upgrade. You should take caution when
 doing large version upgrades. Always backup your database and your home directory.
-The jira::facts class is required for upgrades.
 
 ```puppet
   class { 'jira':
     java_package  => 'java-11-openjdk-headless'
     javahome      => '/usr/lib/jvm/jre-11-opendjk/',
     version     => '8.16.0',
   }
-  class { 'jira::facts': }
 ```
 
 
@@ -121,9 +119,6 @@ The jira::facts class is required for upgrades.
 #### Public Classes
 
 * `jira`: Main class, manages the installation and configuration of JIRA
-* `jira::facts`: Enable external facts for running instance of JIRA. This class is
-  required to handle upgrades of jira. As it is an external fact, we chose not to
-  enable it by default.
 
 #### Private Classes
 
@@ -723,16 +718,9 @@ Reverse proxy can be configured as a hash as part of the JIRA resource
    },
 ```
 
-Enable external facts for puppet version. These facts are required to be
-enabled in order to upgrade to new JIRA versions smoothly.
-
-```puppet
-  class { 'jira::facts': }
-```
-
 ## Limitations
 
-* Puppet 5.5.8+
+* Puppet 6.1.0
 * Puppet Enterprise
 
 The puppetlabs repositories can be found at:

manifests/facts.pp

@@ -107,10 +107,12 @@
   Boolean $service_enable                                           = true,
   $service_notify                                                   = undef,
   $service_subscribe                                                = undef,
-  # Command to stop jira in preparation to updgrade. This is configurable
+  # Command to stop jira in preparation to upgrade. This is configurable
   # incase the jira service is managed outside of puppet. eg: using the
   # puppetlabs-corosync module: 'crm resource stop jira && sleep 15'
-  String $stop_jira                                                 = 'service jira stop && sleep 15',
+  # Note: the command should return either 0 or  5 
+  # when the service doesn't exist
+  String $stop_jira                                                 = 'systemctl stop jira.service && sleep 15',
   # Whether to manage the 'check-java.sh' script, and where to retrieve
   # the script from.
   Boolean $script_check_java_manage                                 = false,
@@ -165,7 +167,7 @@
   Optional[String] $jvm_permgen                                     = undef,
   Optional[Integer[0]] $poolsize                                    = undef,
   Optional[Boolean] $enable_connection_pooling                      = undef,
-) inherits jira::params {
+) {
   if versioncmp($jira::version, '8.0.0') < 0 {
     fail('JIRA versions older than 8.0.0 are no longer supported. Please use an older version of this module to upgrade first.')
   }
@@ -198,15 +200,6 @@
 
   $webappdir = "${installdir}/atlassian-${product_name}-${version}-standalone"
 
-  if defined('$::jira_version') {
-    # If the running version of JIRA is less than the expected version of JIRA
-    # Shut it down in preparation for upgrade.
-    if versioncmp($version, $::jira_version) > 0 {
-      notify { 'Attempting to upgrade JIRA': }
-      exec { $stop_jira: before => Class['jira::install'] }
-    }
-  }
-
   if ! empty($ajp) {
     if ! ('port' in $ajp) {
       fail('You need to specify a valid port for the AJP connector.')

manifests/init.pp

@@ -28,7 +28,7 @@
       password         => '*',
       password_min_age => '0',
       password_max_age => '99999',
-      managehome       => true,
+      managehome       => false,
       uid              => $jira::uid,
       gid              => $jira::gid,
     }
@@ -93,6 +93,21 @@
     subscribe   => User[$jira::user],
   }
 
+  file { "${jira::installdir}/atlassian-${jira::product_name}-running":
+    ensure  => 'link',
+    target  => $jira::webappdir,
+    notify  => Exec['stop-jira-for-version-change'],
+    require => Archive["/tmp/${file}"],
+  }
+
+  exec { 'stop-jira-for-version-change':
+    path        => ['/bin/', '/sbin/', '/usr/bin/', '/usr/sbin/'],
+    command     => $jira::stop_jira,
+    refreshonly => true,
+    # 5 means the service doesn't exist; that's fine
+    returns     => [0, 5],
+  }
+
   if $jira::db == 'mysql' and $jira::mysql_connector_manage {
     class { 'jira::mysql_connector':
       require => Archive["/tmp/${file}"],

manifests/install.pp

@@ -25,17 +25,39 @@ class { 'jira':
         javahome     => $java_home,
         require      => Postgresql::Server::Db['jira'],
       }
+    EOS
+    pp_upgrade = <<-EOS
+      $java_package = $facts['os']['family'] ? {
+        'RedHat' => 'java-11-openjdk-headless',
+        'Debian' => 'openjdk-11-jre-headless',
+      }
+
+      $java_home = $facts['os']['family'] ? {
+        'RedHat' => '/usr/lib/jvm/jre-11-openjdk',
+        'Debian' => '/usr/lib/jvm/java-1.11.0-openjdk-amd64',
+      }
 
-      class { 'jira::facts': }
+      class { 'jira':
+        version      => '8.16.0',
+        java_package => $java_package,
+        javahome     => $java_home,
+      }
     EOS
 
+    # jira just takes *ages* to start up :-(
     apply_manifest(pp, catch_failures: true)
     sleep 60
     shell 'wget -q --tries=24 --retry-connrefused --read-timeout=10 localhost:8080', acceptable_exit_codes: [0, 8]
     sleep 60
     shell 'wget -q --tries=24 --retry-connrefused --read-timeout=10 localhost:8080', acceptable_exit_codes: [0, 8]
     sleep 60
-    apply_manifest(pp, catch_changes: true)
+    apply_manifest(pp_upgrade, catch_failures: true)
+    sleep 60
+    shell 'wget -q --tries=24 --retry-connrefused --read-timeout=10 localhost:8080', acceptable_exit_codes: [0, 8]
+    sleep 60
+    shell 'wget -q --tries=24 --retry-connrefused --read-timeout=10 localhost:8080', acceptable_exit_codes: [0, 8]
+    sleep 60
+    apply_manifest(pp_upgrade, catch_failures: true)
   end
 
   describe process('java') do
@@ -64,7 +86,7 @@ class { 'jira::facts': }
   end
 
   describe command('wget -q --tries=24 --retry-connrefused --read-timeout=10 -O- localhost:8080') do
-    its(:stdout) { is_expected.to include('8.13.5') }
+    its(:stdout) { is_expected.to include('8.16.0') }
   end
 
   describe 'shutdown' do

manifests/params.pp

@@ -48,8 +48,6 @@ class { 'jira':
         tomcat_keystore_file => '/tmp/jira.ks',
         require              => [Mysql::Db['jira'], Java_ks['jira']],
       }
-
-      class { 'jira::facts': }
     EOS
 
     apply_manifest(pp, catch_failures: true)

spec/acceptance/default_parameters_spec.rb

@@ -18,7 +18,10 @@
             end
 
             it { is_expected.to compile.with_all_deps }
-            it { is_expected.to contain_exec('service jira stop && sleep 15') }
+            it do
+              is_expected.to contain_exec('stop-jira-for-version-change').
+                with_command('systemctl stop jira.service && sleep 15')
+            end
           end
           context 'custom params' do
             let(:params) do
@@ -31,7 +34,10 @@
               facts.merge(jira_version: '8.0.0')
             end
 
-            it { is_expected.to contain_exec('stop service please') }
+            it do
+              is_expected.to contain_exec('stop-jira-for-version-change').
+                with_command('stop service please')
+            end
           end
         end
       end