simplify

Author: LukasAud

manifests/init.pp

@@ -114,21 +114,13 @@
   # This workaround is needed because GCP-provisioned SLES images are unregistered BYOS
   # without any package repositories configured. Remove this once proper PAYG images are used.
   if ($facts['os']['family'] in ['SLES', 'SUSE']) {
-    exec { 'Add openSUSE repo if no repos exist':
+    exec { 'Configure zypper repo for SLES':
       path      => '/bin:/usr/bin:/sbin:/usr/sbin',
-      command   => 'zypper --non-interactive --gpg-auto-import-keys ar http://download.opensuse.org/distribution/leap/15.6/repo/oss/ opensuse-leap-fallback',
-      unless    => "zypper lr | grep -q '|'",
+      command   => 'zypper --non-interactive --gpg-auto-import-keys ar http://download.opensuse.org/distribution/leap/15.6/repo/oss/ opensuse-leap-fallback && zypper --non-interactive --gpg-auto-import-keys refresh',
+      unless    => "zypper lr 2>/dev/null | grep -q 'opensuse-leap-fallback\\|http'",
       logoutput => true,
-      before    => Package['java'],
-    }
-
-    exec { 'Refresh zypper repos':
-      path        => '/bin:/usr/bin:/sbin:/usr/sbin',
-      command     => 'zypper --non-interactive --gpg-auto-import-keys refresh',
-      refreshonly => true,
-      subscribe   => Exec['Add openSUSE repo if no repos exist'],
-      before      => Package['java'],
     }
+    -> Package['java']
   }
 
   if $facts['os']['family'] == 'Debian' {