Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes #37580 - Auto-import new GPG keys on SLES #10339

Merged
merged 1 commit into from
Oct 7, 2024
Merged

Fixes #37580 - Auto-import new GPG keys on SLES #10339

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/services/foreman/renderer/scope/macros/host_template.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion app/views/unattended/provisioning_templates/snippet/puppet_setup.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 %>"
Expand Down
2 changes: 1 addition & 1 deletion app/views/unattended/provisioning_templates/snippet/saltstack_setup.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/unit/foreman/renderer/scope/macros/host_template_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ def host_info
@scope.instance_variable_set('@host', host)
command = @scope.install_packages('pkg1')

assert_includes command, 'zypper -n install pkg1'
assert_includes command, 'zypper -n --gpg-auto-import-keys install pkg1'
end
end

Expand Down
Loading