particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

distro/rhel8: adjust RHSM-related config on EC2 8.7+ images

Browse source 
The EC2 images starting with 8.7 should:
 - not configure RHSM using osbuild
 - install `redhat-cloud-client-configuration` package which ships the
   RHSM configuration.

Regenerate affected image manifests

Related to COMPOSER-1804.

Signed-off-by: Tomáš Hozza <thozza@redhat.com>
This commit is contained in:
Tomáš Hozza 2022-10-18 17:45:10 +02:00 • committed by Sanne Raymaekers
parent 10432d6103
commit b65bb9491f
6 changed files with 84 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

10
internal/distro/rhel8/distro.go
View file

@ -1116,6 +1116,16 @@ func newDistro(distroName string) distro.Distro {
},
}
// The RHSM configuration should not be applied since 8.7, but it is instead
// done by installing the redhat-cloud-client-configuration package.
// See COMPOSER-1804 for more information.
rhel87PlusEc2ImageConfigOverride := &distro.ImageConfig{
RHSMConfig: map[distro.RHSMSubscriptionStatus]*osbuild.RHSMStageOptions{},
}
if !common.VersionLessThan(rd.osVersion, "8.7") {
defaultEc2ImageConfig = rhel87PlusEc2ImageConfigOverride.InheritFrom(defaultEc2ImageConfig)
}
// default EC2 images config (x86_64)
defaultEc2ImageConfigX86_64 := &distro.ImageConfig{
DracutConf: append(defaultEc2ImageConfig.DracutConf,

17
internal/distro/rhel8/package_sets.go
View file

@ -412,6 +412,7 @@ func openstackCommonPackageSet(t *imageType) rpmmd.PackageSet {
}
// common package set for RHEL (BYOS/RHUI) and CentOS Stream images
func ec2CommonPackageSet(t *imageType) rpmmd.PackageSet {
return rpmmd.PackageSet{
Include: []string{
@ -468,9 +469,19 @@ func ec2CommonPackageSet(t *imageType) rpmmd.PackageSet {
}.Append(bootPackageSet(t)).Append(distroSpecificPackageSet(t))
}
// common rhel ec2 RHUI image package set
func rhelEc2CommonPackageSet(t *imageType) rpmmd.PackageSet {
ps := ec2CommonPackageSet(t)
// Include "redhat-cloud-client-configuration" on 8.7+ (COMPOSER-1804)
if !common.VersionLessThan(t.arch.distro.osVersion, "8.7") {
ps.Include = append(ps.Include, "redhat-cloud-client-configuration")
}
return ps
}
// rhel-ec2 image package set
func rhelEc2PackageSet(t *imageType) rpmmd.PackageSet {
ec2PackageSet := ec2CommonPackageSet(t)
ec2PackageSet := rhelEc2CommonPackageSet(t)
ec2PackageSet.Include = append(ec2PackageSet.Include, "rh-amazon-rhui-client")
ec2PackageSet.Exclude = append(ec2PackageSet.Exclude, "alsa-lib")
return ec2PackageSet
@ -478,7 +489,7 @@ func rhelEc2PackageSet(t *imageType) rpmmd.PackageSet {
// rhel-ha-ec2 image package set
func rhelEc2HaPackageSet(t *imageType) rpmmd.PackageSet {
ec2HaPackageSet := ec2CommonPackageSet(t)
ec2HaPackageSet := rhelEc2CommonPackageSet(t)
ec2HaPackageSet.Include = append(ec2HaPackageSet.Include,
"fence-agents-all",
"pacemaker",
@ -491,7 +502,7 @@ func rhelEc2HaPackageSet(t *imageType) rpmmd.PackageSet {
// rhel-sap-ec2 image package set
func rhelEc2SapPackageSet(t *imageType) rpmmd.PackageSet {
ec2SapPackageSet := ec2CommonPackageSet(t)
ec2SapPackageSet := rhelEc2CommonPackageSet(t)
ec2SapPackageSet.Include = append(ec2SapPackageSet.Include,
// RHBZ#2074107
"@Server",

28
test/data/manifests/rhel_87-aarch64-ec2-boot.json
View file

@ -2042,6 +2042,9 @@
{
"id": "sha256:af66bf2a5fb6127432df7d1ec52317186a6fd9895824a49df7c7f444628d29de"
},
{
"id": "sha256:0942e19ecae75b9b0f30f10c1469b783e0887728bdbd946b6e49d7c3fabc4593"
},
{
"id": "sha256:49cdfef82844bbea79f29adb5aaa92df35b505761e5471a47f206f6c8b22500a"
},
@ -2161,19 +2164,6 @@
}
}
},
{
"type": "org.osbuild.rhsm",
"options": {
"subscription-manager": {
"rhsm": {
"manage_repos": false
},
"rhsmcertd": {
"auto_registration": true
}
}
}
},
{
"type": "org.osbuild.systemd-logind",
"options": {
@ -2535,6 +2525,9 @@
"sha256:091c66cfa39a987157fb8c94d70b45746c261147628697d69e81d1a8e4de93fe": {
"url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-baseos-n8.7-20221015/Packages/libcom_err-1.45.6-5.el8.aarch64.rpm"
},
"sha256:0942e19ecae75b9b0f30f10c1469b783e0887728bdbd946b6e49d7c3fabc4593": {
"url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-appstream-n8.7-20221015/Packages/redhat-cloud-client-configuration-1-10.el8.noarch.rpm"
},
"sha256:0949d134a433c2917f8621217e60d59457ef637e39241c6cbd2f65864d95ca89": {
"url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-appstream-n8.7-20221015/Packages/isomd5sum-1.2.3-3.el8.aarch64.rpm"
},
@ -9728,6 +9721,15 @@
"remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-appstream-n8.7-20221015/Packages/python3-unbound-1.16.2-2.el8.aarch64.rpm",
"checksum": "sha256:af66bf2a5fb6127432df7d1ec52317186a6fd9895824a49df7c7f444628d29de"
},
{
"name": "redhat-cloud-client-configuration",
"epoch": 0,
"version": "1",
"release": "10.el8",
"arch": "noarch",
"remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-appstream-n8.7-20221015/Packages/redhat-cloud-client-configuration-1-10.el8.noarch.rpm",
"checksum": "sha256:0942e19ecae75b9b0f30f10c1469b783e0887728bdbd946b6e49d7c3fabc4593"
},
{
"name": "rhc",
"epoch": 1,

28
test/data/manifests/rhel_87-x86_64-ec2-boot.json
View file

@ -1990,6 +1990,9 @@
{
"id": "sha256:07225cc5242e12c7bd8f30bf19131d11d749006d8dcd5e2fa02844e1e27720f5"
},
{
"id": "sha256:0942e19ecae75b9b0f30f10c1469b783e0887728bdbd946b6e49d7c3fabc4593"
},
{
"id": "sha256:821923c32f6cd4c764ea7e97bee3335993d405694aa81b923cf1ef46c9e03cf9"
},
@ -2101,19 +2104,6 @@
}
}
},
{
"type": "org.osbuild.rhsm",
"options": {
"subscription-manager": {
"rhsm": {
"manage_repos": false
},
"rhsmcertd": {
"auto_registration": true
}
}
}
},
{
"type": "org.osbuild.systemd-logind",
"options": {
@ -2426,6 +2416,9 @@
"sha256:09149617095dc52e19cdce1e45c8245e1e92d371bd4d107320ff56788b9977f1": {
"url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libusbx-1.0.23-4.el8.x86_64.rpm"
},
"sha256:0942e19ecae75b9b0f30f10c1469b783e0887728bdbd946b6e49d7c3fabc4593": {
"url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/redhat-cloud-client-configuration-1-10.el8.noarch.rpm"
},
"sha256:0968073d2f23b87841d4a3876f5a7d7ec472916c57597b36c45d5a9e85a321c8": {
"url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/dracut-squash-049-209.git20220815.el8.x86_64.rpm"
},
@ -9382,6 +9375,15 @@
"remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/python3-unbound-1.16.2-2.el8.x86_64.rpm",
"checksum": "sha256:07225cc5242e12c7bd8f30bf19131d11d749006d8dcd5e2fa02844e1e27720f5"
},
{
"name": "redhat-cloud-client-configuration",
"epoch": 0,
"version": "1",
"release": "10.el8",
"arch": "noarch",
"remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/redhat-cloud-client-configuration-1-10.el8.noarch.rpm",
"checksum": "sha256:0942e19ecae75b9b0f30f10c1469b783e0887728bdbd946b6e49d7c3fabc4593"
},
{
"name": "rhc",
"epoch": 1,

28
test/data/manifests/rhel_87-x86_64-ec2_ha-boot.json
View file

@ -2423,6 +2423,9 @@
{
"id": "sha256:ee2ba576f07f5cdd9cf24e788d60071869107aa313addbba0a311448bb32a86c"
},
{
"id": "sha256:0942e19ecae75b9b0f30f10c1469b783e0887728bdbd946b6e49d7c3fabc4593"
},
{
"id": "sha256:821923c32f6cd4c764ea7e97bee3335993d405694aa81b923cf1ef46c9e03cf9"
},
@ -2634,19 +2637,6 @@
}
}
},
{
"type": "org.osbuild.rhsm",
"options": {
"subscription-manager": {
"rhsm": {
"manage_repos": false
},
"rhsmcertd": {
"auto_registration": true
}
}
}
},
{
"type": "org.osbuild.systemd-logind",
"options": {
@ -2965,6 +2955,9 @@
"sha256:09149617095dc52e19cdce1e45c8245e1e92d371bd4d107320ff56788b9977f1": {
"url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libusbx-1.0.23-4.el8.x86_64.rpm"
},
"sha256:0942e19ecae75b9b0f30f10c1469b783e0887728bdbd946b6e49d7c3fabc4593": {
"url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/redhat-cloud-client-configuration-1-10.el8.noarch.rpm"
},
"sha256:0968073d2f23b87841d4a3876f5a7d7ec472916c57597b36c45d5a9e85a321c8": {
"url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/dracut-squash-049-209.git20220815.el8.x86_64.rpm"
},
@ -11679,6 +11672,15 @@
"remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/python36-3.6.8-38.module+el8.5.0+12207+5c5719bc.x86_64.rpm",
"checksum": "sha256:ee2ba576f07f5cdd9cf24e788d60071869107aa313addbba0a311448bb32a86c"
},
{
"name": "redhat-cloud-client-configuration",
"epoch": 0,
"version": "1",
"release": "10.el8",
"arch": "noarch",
"remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/redhat-cloud-client-configuration-1-10.el8.noarch.rpm",
"checksum": "sha256:0942e19ecae75b9b0f30f10c1469b783e0887728bdbd946b6e49d7c3fabc4593"
},
{
"name": "rhc",
"epoch": 1,

28
test/data/manifests/rhel_87-x86_64-ec2_sap-boot.json
View file

@ -3098,6 +3098,9 @@
{
"id": "sha256:82a0a81bbbb08573f3415eb08745361b55fba175a59f75f72720e3d232fc8755"
},
{
"id": "sha256:0942e19ecae75b9b0f30f10c1469b783e0887728bdbd946b6e49d7c3fabc4593"
},
{
"id": "sha256:65f09851bd80394b34b388d3df5bc6955bfa7e5a9a525bebe915e5adf9052780"
},
@ -3342,19 +3345,6 @@
}
}
},
{
"type": "org.osbuild.rhsm",
"options": {
"subscription-manager": {
"rhsm": {
"manage_repos": false
},
"rhsmcertd": {
"auto_registration": true
}
}
}
},
{
"type": "org.osbuild.systemd-logind",
"options": {
@ -3823,6 +3813,9 @@
"sha256:09149617095dc52e19cdce1e45c8245e1e92d371bd4d107320ff56788b9977f1": {
"url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libusbx-1.0.23-4.el8.x86_64.rpm"
},
"sha256:0942e19ecae75b9b0f30f10c1469b783e0887728bdbd946b6e49d7c3fabc4593": {
"url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/redhat-cloud-client-configuration-1-10.el8.noarch.rpm"
},
"sha256:0968073d2f23b87841d4a3876f5a7d7ec472916c57597b36c45d5a9e85a321c8": {
"url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/dracut-squash-049-209.git20220815.el8.x86_64.rpm"
},
@ -15129,6 +15122,15 @@
"remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/python39-six-1.15.0-3.module+el8.4.0+9822+20bf1249.noarch.rpm",
"checksum": "sha256:82a0a81bbbb08573f3415eb08745361b55fba175a59f75f72720e3d232fc8755"
},
{
"name": "redhat-cloud-client-configuration",
"epoch": 0,
"version": "1",
"release": "10.el8",
"arch": "noarch",
"remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/redhat-cloud-client-configuration-1-10.el8.noarch.rpm",
"checksum": "sha256:0942e19ecae75b9b0f30f10c1469b783e0887728bdbd946b6e49d7c3fabc4593"
},
{
"name": "rest",
"epoch": 0,