d9029cec24
- Improve set_systemd_services_states logging - [IPU 7 -> 8] Fix detection of bootable device on RAID - Fix detection of valid sshd config with internal-sftp subsystem in Leapp - Handle a false positive GPG check error when TargetUserSpaceInfo is missing - Fix failing "update-ca-trust" command caused by missing util-linux package - Improve report when a system is unsupported - Fix handling of versions in RHUI configuration for ELS and SAP upgrades - Add missing RHUI GCP config info for RHEL for SAP - Resolves: RHEL-33902, RHEL-30573, RHEL-43978, RHEL-39046, RHEL-39047, RHEL-39049
38 lines
1.6 KiB
Diff
38 lines
1.6 KiB
Diff
From 76ac12560c4ea8223a59ec5a8233a86412dbf158 Mon Sep 17 00:00:00 2001
|
|
From: "jinkangkang.jkk" <jinkangkang.jkk@alibaba-inc.com>
|
|
Date: Mon, 3 Jun 2024 17:12:02 +0800
|
|
Subject: [PATCH 52/92] rhui setups support alibaba cloud
|
|
|
|
---
|
|
repos/system_upgrade/common/libraries/rhui.py | 14 +++++++++++++-
|
|
1 file changed, 13 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/repos/system_upgrade/common/libraries/rhui.py b/repos/system_upgrade/common/libraries/rhui.py
|
|
index 2dfb209c..ab6a27f8 100644
|
|
--- a/repos/system_upgrade/common/libraries/rhui.py
|
|
+++ b/repos/system_upgrade/common/libraries/rhui.py
|
|
@@ -290,7 +290,19 @@ RHUI_SETUPS = {
|
|
RHUIFamily(RHUIProvider.ALIBABA, client_files_folder='alibaba'): [
|
|
mk_rhui_setup(clients={'client-rhel7'}, os_version='7'),
|
|
mk_rhui_setup(clients={'aliyun_rhui_rhel8'}, leapp_pkg='leapp-rhui-alibaba',
|
|
- mandatory_files=[('leapp-alibaba.repo', YUM_REPOS_PATH)], os_version='8'),
|
|
+ mandatory_files=[('leapp-alibaba.repo', YUM_REPOS_PATH)],
|
|
+ optional_files=[
|
|
+ ('key.pem', RHUI_PKI_DIR),
|
|
+ ('content.crt', RHUI_PKI_PRODUCT_DIR)
|
|
+ ],
|
|
+ os_version='8'),
|
|
+ mk_rhui_setup(clients={'aliyun_rhui_rhel9'}, leapp_pkg='leapp-rhui-alibaba',
|
|
+ mandatory_files=[('leapp-alibaba.repo', YUM_REPOS_PATH)],
|
|
+ optional_files=[
|
|
+ ('key.pem', RHUI_PKI_DIR),
|
|
+ ('content.crt', RHUI_PKI_PRODUCT_DIR)
|
|
+ ],
|
|
+ os_version='9'),
|
|
]
|
|
}
|
|
|
|
--
|
|
2.42.0
|
|
|