37 lines
1.6 KiB
Diff
37 lines
1.6 KiB
Diff
From 08196d4533c51b9f9d7d45d90ca0bad8b0ef697d Mon Sep 17 00:00:00 2001
|
|
From: Michal Hecko <mhecko@redhat.com>
|
|
Date: Fri, 4 Jul 2025 14:05:48 +0200
|
|
Subject: [PATCH 64/66] rhui(azure): add target client's GPG key to mandatory
|
|
files
|
|
|
|
The RHEL10's Azure RHUI client is signed using a different GPG
|
|
key than RHEL9 client. Therefore, we need to have the key available
|
|
when we try to bootstrap the RHEL10 client during the upgrade.
|
|
|
|
Jira-ref: RHEL-64911
|
|
---
|
|
repos/system_upgrade/common/libraries/rhui.py | 7 ++++++-
|
|
1 file changed, 6 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/repos/system_upgrade/common/libraries/rhui.py b/repos/system_upgrade/common/libraries/rhui.py
|
|
index e1ab7c67..1e3b5359 100644
|
|
--- a/repos/system_upgrade/common/libraries/rhui.py
|
|
+++ b/repos/system_upgrade/common/libraries/rhui.py
|
|
@@ -273,7 +273,12 @@ RHUI_SETUPS = {
|
|
extra_info={'agent_pkg': 'WALinuxAgent'},
|
|
os_version='9'),
|
|
mk_rhui_setup(clients={'rhui-azure-rhel10'}, leapp_pkg='leapp-rhui-azure',
|
|
- mandatory_files=[('leapp-azure.repo', YUM_REPOS_PATH)],
|
|
+ mandatory_files=[
|
|
+ ('leapp-azure.repo', YUM_REPOS_PATH),
|
|
+ # We need to have the new GPG key ready when we will be bootstrapping
|
|
+ # target rhui client.
|
|
+ ('RPM-GPG-KEY-microsoft-azure-release-new', '/etc/pki/rpm-gpg/')
|
|
+ ],
|
|
optional_files=[
|
|
('key.pem', RHUI_PKI_DIR),
|
|
('content.crt', RHUI_PKI_PRODUCT_DIR)
|
|
--
|
|
2.50.1
|
|
|