MSVSphere Packaging Team
3 months ago
parent
8c027fc418
commit
2118210173
GPG Key ID:
B2B0B9F29E528FE8
@ -1,2 +1,2 @@
|
|||||||
SOURCES/deps-pkgs-9.tar.gz
|
SOURCES/deps-pkgs-10.tar.gz
|
||||||
SOURCES/leapp-repository-0.19.0.tar.gz
|
SOURCES/leapp-repository-0.21.0.tar.gz
|
||||||
|
|||||||
@ -1,2 +1,2 @@
|
|||||||
02499ccd70d4a8e6ce9ad29bd286a317d5e0b57b SOURCES/deps-pkgs-9.tar.gz
|
d520ada12294e4dd8837c81f92d4c184ab403d51 SOURCES/deps-pkgs-10.tar.gz
|
||||||
79402ad1aa427e43bdce143f4c0641dda383eb5d SOURCES/leapp-repository-0.19.0.tar.gz
|
9327be3720ccb3f7b285d2199463d7df0c38dfae SOURCES/leapp-repository-0.21.0.tar.gz
|
||||||
|
|||||||
@ -1,37 +0,0 @@
|
|||||||
From b6e409e1055b5d8b7f27e5df9eae096eb592a9c7 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Petr Stodulka <pstodulk@redhat.com>
|
|
||||||
Date: Fri, 27 Oct 2023 13:34:38 +0200
|
|
||||||
Subject: [PATCH] RHSM: Adjust the switch to container mode for new RHSM
|
|
||||||
|
|
||||||
RHSM in RHEL 8.9+ & RHEL 9.3+ requires newly for the switch to the
|
|
||||||
container mode existence and content under /etc/pki/entitlement-host,
|
|
||||||
which in our case should by symlink to /etc/pki/entitlement.
|
|
||||||
|
|
||||||
So currently we need for the correct switch 2 symlinks:
|
|
||||||
* /etc/pki/rhsm-host -> /etc/pki/rhsm
|
|
||||||
* /etc/pki/entitlement-host -> /etc/pki/entitlement
|
|
||||||
|
|
||||||
Technically we need that only for RHEL 8.9+ but discussing it with
|
|
||||||
RHSM SST, we can do this change unconditionally for any RHEL system
|
|
||||||
as older versions of RHSM do not check /etc/pki/entitlement-host.
|
|
||||||
|
|
||||||
jira: RHEL-14839
|
|
||||||
---
|
|
||||||
repos/system_upgrade/common/libraries/rhsm.py | 1 +
|
|
||||||
1 file changed, 1 insertion(+)
|
|
||||||
|
|
||||||
diff --git a/repos/system_upgrade/common/libraries/rhsm.py b/repos/system_upgrade/common/libraries/rhsm.py
|
|
||||||
index 4a5b0eb0..18842021 100644
|
|
||||||
--- a/repos/system_upgrade/common/libraries/rhsm.py
|
|
||||||
+++ b/repos/system_upgrade/common/libraries/rhsm.py
|
|
||||||
@@ -334,6 +334,7 @@ def set_container_mode(context):
|
|
||||||
return
|
|
||||||
try:
|
|
||||||
context.call(['ln', '-s', '/etc/rhsm', '/etc/rhsm-host'])
|
|
||||||
+ context.call(['ln', '-s', '/etc/pki/entitlement', '/etc/pki/entitlement-host'])
|
|
||||||
except CalledProcessError:
|
|
||||||
raise StopActorExecutionError(
|
|
||||||
message='Cannot set the container mode for the subscription-manager.')
|
|
||||||
--
|
|
||||||
2.41.0
|
|
||||||
|
|
||||||
@ -0,0 +1,43 @@
|
|||||||
|
From fbc38d4ad1d828e0553579e3719c0e4ed4a2a6bd Mon Sep 17 00:00:00 2001
|
||||||
|
From: jinkangkang <1547182170@qq.com>
|
||||||
|
Date: Mon, 19 Aug 2024 18:46:08 +0800
|
||||||
|
Subject: [PATCH] rhui(alibaba): add ARM RHEL8 and RHEL9 setup entries (#1277)
|
||||||
|
|
||||||
|
Since leapp's RHUI mechanism filters setups based on the architecture of the source system,
|
||||||
|
it was not possible to upgrade of ARM-based RHEL systems on Alibaba cloud as there
|
||||||
|
were no ARM entries in RHUI_SETUPS. This patch adds these entries, making it possible
|
||||||
|
for EL 8 -> 9 upgrades of ARM systems on Alibaba cloud.
|
||||||
|
---
|
||||||
|
repos/system_upgrade/common/libraries/rhui.py | 16 ++++++++++++++++
|
||||||
|
1 file changed, 16 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/repos/system_upgrade/common/libraries/rhui.py b/repos/system_upgrade/common/libraries/rhui.py
|
||||||
|
index 51694ac2..30de0275 100644
|
||||||
|
--- a/repos/system_upgrade/common/libraries/rhui.py
|
||||||
|
+++ b/repos/system_upgrade/common/libraries/rhui.py
|
||||||
|
@@ -348,6 +348,22 @@ RHUI_SETUPS = {
|
||||||
|
('content.crt', RHUI_PKI_PRODUCT_DIR)
|
||||||
|
],
|
||||||
|
os_version='9'),
|
||||||
|
+ ],
|
||||||
|
+ RHUIFamily(RHUIProvider.ALIBABA, arch=arch.ARCH_ARM64, client_files_folder='alibaba'): [
|
||||||
|
+ mk_rhui_setup(clients={'aliyun_rhui_rhel8'}, 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='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.45.2
|
||||||
|
|
||||||
@ -1,62 +0,0 @@
|
|||||||
From d1f28cbd143f2dce85f7f175308437954847aba8 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Petr Stodulka <pstodulk@redhat.com>
|
|
||||||
Date: Thu, 2 Nov 2023 14:20:11 +0100
|
|
||||||
Subject: [PATCH] Do not create dangling symlinks for containerized RHSM
|
|
||||||
|
|
||||||
When setting RHSM into the container mode, we are creating symlinks
|
|
||||||
to /etc/rhsm and /etc/pki/entitlement directories. However, this
|
|
||||||
creates dangling symlinks if RHSM is not installed or user manually
|
|
||||||
removes one of these dirs.
|
|
||||||
|
|
||||||
If any of these directories is missing, skip other actions and
|
|
||||||
log the warning. Usually it means that RHSM is not actually used
|
|
||||||
or installed at all, so in these cases we can do the skip. The
|
|
||||||
only corner case when system could use RHSM without
|
|
||||||
/etc/pki/entitlement is when RHSM is configured to put these
|
|
||||||
certificate on a different path, and we do not support nor cover
|
|
||||||
such a scenario as we are not scanning the RHSM configuration at
|
|
||||||
all.
|
|
||||||
|
|
||||||
This also solves the problems on systems that does not have RHSM
|
|
||||||
available at all.
|
|
||||||
---
|
|
||||||
repos/system_upgrade/common/libraries/rhsm.py | 16 ++++++++++++++++
|
|
||||||
1 file changed, 16 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/repos/system_upgrade/common/libraries/rhsm.py b/repos/system_upgrade/common/libraries/rhsm.py
|
|
||||||
index 18842021..eb388829 100644
|
|
||||||
--- a/repos/system_upgrade/common/libraries/rhsm.py
|
|
||||||
+++ b/repos/system_upgrade/common/libraries/rhsm.py
|
|
||||||
@@ -325,6 +325,11 @@ def set_container_mode(context):
|
|
||||||
could be affected and the generated repo file in the container could be
|
|
||||||
affected as well (e.g. when the release is set, using rhsm, on the host).
|
|
||||||
|
|
||||||
+ We want to put RHSM into the container mode always when /etc/rhsm and
|
|
||||||
+ /etc/pki/entitlement directories exists, even when leapp is executed with
|
|
||||||
+ --no-rhsm option. If any of these directories are missing, skip other
|
|
||||||
+ actions - most likely RHSM is not installed in such a case.
|
|
||||||
+
|
|
||||||
:param context: An instance of a mounting.IsolatedActions class
|
|
||||||
:type context: mounting.IsolatedActions class
|
|
||||||
"""
|
|
||||||
@@ -332,6 +337,17 @@ def set_container_mode(context):
|
|
||||||
api.current_logger().error('Trying to set RHSM into the container mode'
|
|
||||||
'on host. Skipping the action.')
|
|
||||||
return
|
|
||||||
+ # TODO(pstodulk): check "rhsm identity" whether system is registered
|
|
||||||
+ # and the container mode should be required
|
|
||||||
+ if (not os.path.exists(context.full_path('/etc/rhsm'))
|
|
||||||
+ or not os.path.exists(context.full_path('/etc/pki/entitlement'))):
|
|
||||||
+ api.current_logger().warning(
|
|
||||||
+ 'Cannot set the container mode for the subscription-manager as'
|
|
||||||
+ ' one of required directories is missing. Most likely RHSM is not'
|
|
||||||
+ ' installed. Skipping other actions.'
|
|
||||||
+ )
|
|
||||||
+ return
|
|
||||||
+
|
|
||||||
try:
|
|
||||||
context.call(['ln', '-s', '/etc/rhsm', '/etc/rhsm-host'])
|
|
||||||
context.call(['ln', '-s', '/etc/pki/entitlement', '/etc/pki/entitlement-host'])
|
|
||||||
--
|
|
||||||
2.41.0
|
|
||||||
|
|
||||||
Loading…
Reference in new issue