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

distro/rhel8: separate minor-version-specific image types

Browse source 
edge-raw and edge-simplified-installer: only on 8.6+
ec2 and ec2-ha: available on all RHEL 8
ec2-sap: available on 8.4 and 8.6+ (no 8.5)

The ec2-sap image requires ansible, which in 8.4 is called `ansible` and
was replaced by `ansible-core` in 8.6.
This commit is contained in:
Achilleas Koutsou 2022-07-05 19:43:26 +02:00 • committed by Tom Gundersen
parent 0adb742ede
commit 0bf09ba60c
2 changed files with 25 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1869,21 +1869,27 @@ func newDistro(distroName string) distro.Distro {
) )
if rd.isRHEL() { if rd.isRHEL() {
if !versionLessThan(rd.osVersion, "8.6") {
// image types only available on 8.6 and later on RHEL
// These edge image types require FDO which aren't available on older versions
x86_64.addImageTypes(edgeSimplifiedInstallerImgType, edgeRawImgType)
aarch64.addImageTypes(edgeSimplifiedInstallerImgType, edgeRawImgType)
}
// add azure to RHEL distro only // add azure to RHEL distro only
x86_64.addImageTypes(azureRhuiImgType) x86_64.addImageTypes(azureRhuiImgType)
// add ec2 image types to RHEL distro only // add ec2 image types to RHEL distro only
x86_64.addImageTypes(ec2ImgTypeX86_64, ec2HaImgTypeX86_64) x86_64.addImageTypes(ec2ImgTypeX86_64, ec2HaImgTypeX86_64)
if !versionLessThan(rd.osVersion, "8.6") {
x86_64.addImageTypes(ec2SapImgTypeX86_64)
// edge simplified installer is only available on 8.6 and later on RHEL
x86_64.addImageTypes(edgeSimplifiedInstallerImgType, edgeRawImgType)
aarch64.addImageTypes(edgeSimplifiedInstallerImgType, edgeRawImgType)
}
aarch64.addImageTypes(ec2ImgTypeAarch64) aarch64.addImageTypes(ec2ImgTypeAarch64)
if rd.osVersion != "8.5" {
// NOTE: RHEL 8.5 is going away and these image types require some
// work to get working, so we just disable them here until the
// whole distro gets deleted
x86_64.addImageTypes(ec2SapImgTypeX86_64)
}
// add GCE RHUI image to RHEL only // add GCE RHUI image to RHEL only
x86_64.addImageTypes(gceRhuiImgType) x86_64.addImageTypes(gceRhuiImgType)

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

@ -606,7 +606,6 @@ func rhelEc2SapPackageSet(t *imageType) rpmmd.PackageSet {
"@Server", "@Server",
// SAP System Roles // SAP System Roles
// https://access.redhat.com/sites/default/files/attachments/rhel_system_roles_for_sap_1.pdf // https://access.redhat.com/sites/default/files/attachments/rhel_system_roles_for_sap_1.pdf
"ansible-core", // RHBZ#2077356
"rhel-system-roles-sap", "rhel-system-roles-sap",
// RHBZ#1959813 // RHBZ#1959813
"bind-utils", "bind-utils",
@ -641,6 +640,17 @@ func rhelEc2SapPackageSet(t *imageType) rpmmd.PackageSet {
// RHUI client // RHUI client
"rh-amazon-rhui-client-sap-bundle-e4s", "rh-amazon-rhui-client-sap-bundle-e4s",
) )
if t.arch.distro.osVersion == "8.4" {
ec2SapPackageSet = ec2SapPackageSet.Append(rpmmd.PackageSet{
Include: []string{"ansible"},
})
} else {
// 8.6+ and CS8 (image type does not exist on 8.5)
ec2SapPackageSet = ec2SapPackageSet.Append(rpmmd.PackageSet{
Include: []string{"ansible-core"}, // RHBZ#2077356
})
}
return ec2SapPackageSet return ec2SapPackageSet
} }