sig_cloud/diskimage-builder
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Update satellite_repo labels + add env var"

Browse Source
This commit is contained in:
Zuul 2023-04-13 08:32:31 +00:00 committed by Gerrit Code Review
commit da03a4d160
3 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
diskimage_builder/elements/rhel-common/README.rst
View File

@ -122,6 +122,19 @@ is applicable to both physical systems and virtual guests. Other types include
hypervisor for virtual hosts, person, domain, rhui, and candlepin for some hypervisor for virtual hosts, person, domain, rhui, and candlepin for some
subscription management applications. subscription management applications.
#### REG\_SAT\_REPO
Sets the repository label for Satellite client tools. The defaults are:
+------------+--------------------------------------------+
| Release | Repository label |
+============+============================================+
| RHEL 7 | rhel-7-server-satellite-client-6-rpms |
+------------+--------------------------------------------+
| RHEL 8 | satellite-client-6-for-rhel-8-${arch}-rpms |
+------------+--------------------------------------------+
| RHEL 9 | satellite-client-6-for-rhel-9-${arch}-rpms |
+------------+--------------------------------------------+
Image Build Registration Examples Image Build Registration Examples
------------------------------------ ------------------------------------
To register with Satellite 6, a common example would be to set the following To register with Satellite 6, a common example would be to set the following

6
diskimage_builder/elements/rhel-common/pre-install.d/00-rhel-registration
View File

@ -15,17 +15,17 @@ base_repos=
if [ "${DIB_RELEASE:-7}" == "7" ]; then if [ "${DIB_RELEASE:-7}" == "7" ]; then
base_repos="rhel-7-server-rpms" base_repos="rhel-7-server-rpms"
satellite_repo="rhel-7-server-rh-common-rpms" satellite_repo="${REG_SAT_REPO:-"rhel-7-server-satellite-client-6-rpms"}"
elif [ "${DIB_RELEASE}" == "8" ]; then elif [ "${DIB_RELEASE}" == "8" ]; then
if [ -n "${REG_RELEASE:-}" ]; then if [ -n "${REG_RELEASE:-}" ]; then
base_repos="rhel-8-for-${arch}-appstream-eus-rpms rhel-8-for-${arch}-baseos-eus-rpms" base_repos="rhel-8-for-${arch}-appstream-eus-rpms rhel-8-for-${arch}-baseos-eus-rpms"
else else
base_repos="rhel-8-for-${arch}-appstream-rpms rhel-8-for-${arch}-baseos-rpms" base_repos="rhel-8-for-${arch}-appstream-rpms rhel-8-for-${arch}-baseos-rpms"
fi fi
satellite_repo="satellite-tools-6.5-for-rhel-8-${arch}-rpms" satellite_repo="${REG_SAT_REPO:-"satellite-client-6-for-rhel-8-${arch}-rpms"}"
elif [ "${DIB_RELEASE}" == "9" ]; then elif [ "${DIB_RELEASE}" == "9" ]; then
base_repos="rhel-9-for-${arch}-appstream-rpms rhel-9-for-${arch}-baseos-rpms" base_repos="rhel-9-for-${arch}-appstream-rpms rhel-9-for-${arch}-baseos-rpms"
satellite_repo="rhel-9-for-${arch}-highavailability-rpms" satellite_repo="${REG_SAT_REPO:-"satellite-client-6-for-rhel-9-${arch}-rpms"}"
fi fi
REG_SAT_CERT=${REG_SAT_CERT:-"katello-ca-consumer-latest.noarch.rpm"} REG_SAT_CERT=${REG_SAT_CERT:-"katello-ca-consumer-latest.noarch.rpm"}

16
releasenotes/notes/bug-2013451-0874e20db0231c56.yaml Normal file
View File

@ -0,0 +1,16 @@
---
features:
- |
Added environment variable ``REG_SAT_REPO`` to the ``rhel-common``
element. Sets the repository label for Satellite client tools.
fixes:
- |
The ``Satellite Client`` reposotories replaces the ``Satellite Tools``
repository since Satellite 6.11. The default repo labels in the
``rhel-common`` element has been updated to reflect this change.
See `Red Hat Satellite 6.11 Release Notes <https://access.redhat.com/documentation/en-us/red_hat_satellite/6.11/html/release_notes/assembly_introducing-red-hat-satellite_sat6-release-notes>`_.
To enable users that need to use the legacy ``Satellite Tools``
repository, the ``REG_SAT_REPO`` environment variable has been added to
enable manual override of the Satellite repository.