meta-starlingx/meta-stx-cloud/recipes-support/puppet/files/puppetlabs-postgresql/0005-puppetlabs-postgresql-poky.patch

   1 diff -ru a/manifests/globals.pp b/manifests/globals.pp
   2 --- a/manifests/globals.pp      2020-03-04 10:59:33.651335723 +0800
   3 +++ b/manifests/globals.pp      2020-03-04 11:00:13.407336807 +0800
   4 @@ -94,6 +94,10 @@
   5          /^(16.04)$/ => '9.5',
   6          default => undef,
   7        },
   8 +      'poky-stx' => $::operatingsystemrelease ? {
   9 +        /^2\./ => '11.5',
  10 +        default => undef,
  11 +      },
  12        default => undef,
  13      },
  14      'Archlinux' => $::operatingsystem ? {
  15 @@ -136,6 +140,7 @@
  16      '9.4'   => '2.1',
  17      '9.5'   => '2.2',
  18      '9.6'   => '2.3',
  19 +    '11.5'   => '2.5',
  20      default => undef,
  21    }
  22    $globals_postgis_version = $postgis_version ? {
  23 diff -ru a/manifests/params.pp b/manifests/params.pp
  24 --- a/manifests/params.pp       2020-03-04 10:59:33.651335723 +0800
  25 +++ b/manifests/params.pp       2020-03-04 10:59:42.423335963 +0800
  26 @@ -166,6 +166,8 @@
  27        } elsif $::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemrelease, '15.04') >= 0 {
  28          # Ubuntu releases since vivid use systemd
  29          $service_status = pick($service_status, "/usr/sbin/service ${service_name} status")
  30 +      } elsif $::operatingsystem == 'poky-stx' {
  31 +        $service_status = "systemctl is-active ${service_name}"
  32        } else {
  33          $service_status = pick($service_status, "/etc/init.d/${service_name} status | /bin/egrep -q 'Running clusters: .+|online'")
  34        }
  35 diff -ru a/templates/systemd-override.erb b/templates/systemd-override.erb
  36 --- a/templates/systemd-override.erb    2020-03-04 10:59:33.735335726 +0800
  37 +++ b/templates/systemd-override.erb    2020-03-04 10:59:42.423335963 +0800
  38 @@ -2,6 +2,8 @@
  39  .include /usr/lib64/systemd/system/<%= @service_name %>.service
  40  <%- elsif scope.lookupvar('::operatingsystem') == 'Fedora' -%>
  41  .include /lib/systemd/system/<%= @service_name %>.service
  42 +<%- elsif scope.lookupvar('::operatingsystem') == 'poky-stx' -%>
  43 +.include /lib/systemd/system/<%= @service_name %>.service
  44  <% else -%>
  45  .include /usr/lib/systemd/system/<%= @service_name %>.service
  46  <% end -%>