Fixes #37870 - Auto-import new GPG keys on SLES

theforeman · Oct 1, 2024 · 51c6ec5 · 51c6ec5
1 parent 5fdab0f
commit 51c6ec5
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/app/services/foreman/renderer/scope/macros/host_template.rb b/app/services/foreman/renderer/scope/macros/host_template.rb
@@ -173,7 +173,7 @@ def install_packages(packages)
               <<~CMD
                 #{banner}
                 zypper refresh
-                zypper -n install #{packages}
+                zypper -n --gpg-auto-import-keys install #{packages}
               CMD
             else
               raise UnsupportedOS.new

diff --git a/app/views/unattended/provisioning_templates/snippet/puppet_setup.erb b/app/views/unattended/provisioning_templates/snippet/puppet_setup.erb
@@ -60,7 +60,7 @@ rpmkeys --import https://yum.puppet.com/RPM-GPG-KEY-puppetlabs
 rpmkeys --import https://yum.puppet.com/RPM-GPG-KEY-puppet
 <% end -%>
 <% if @host.provision_method == 'image' -%>
-/usr/bin/zypper -n install <%= linux_package %>
+/usr/bin/zypper -n --gpg-auto-import-keys install <%= linux_package %>
 <% end -%>
 <% elsif os_family == 'Windows' -%>
 $puppet_agent_msi = "${env:TEMP}\<%= windows_package %>"

diff --git a/app/views/unattended/provisioning_templates/snippet/saltstack_setup.erb b/app/views/unattended/provisioning_templates/snippet/saltstack_setup.erb
@@ -22,7 +22,7 @@ else
   yum -t -y install salt-minion
 fi
 <% elsif @host.operatingsystem.family == 'Suse' -%>
-  /usr/bin/zypper -n install salt-minion
+  /usr/bin/zypper -n --gpg-auto-import-keys install salt-minion
 <% end -%>
 
 cat > <%= etc_path %>/minion.d/minion.conf << EOF