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

distro: Separate out RHEL9 SAP package set into its own function

Browse source 
This also moves cloud specific client packages into that cloud's
PackageSet so that the SAP packages are common to all users.
This commit is contained in:
Brian C. Lane 2022-10-27 14:20:36 -07:00 • committed by Tomáš Hozza
parent b785af25ed
commit ff823a93e1
2 changed files with 45 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

42
internal/distro/rhel9/package_sets.go
View file

@ -629,48 +629,14 @@ func rhelEc2HaPackageSet(t *imageType) rpmmd.PackageSet {
}
// rhel-sap-ec2 image package set
// Includes the common ec2 package set, the common SAP packages, and
// the amazon rhui sap package
func rhelEc2SapPackageSet(t *imageType) rpmmd.PackageSet {
ec2SapPackageSet := rhelEc2CommonPackageSet(t)
ec2SapPackageSet = ec2SapPackageSet.Append(rpmmd.PackageSet{
return rpmmd.PackageSet{
Include: []string{
// RHBZ#2076763
"@Server",
// SAP System Roles
// https://access.redhat.com/sites/default/files/attachments/rhel_system_roles_for_sap_1.pdf
"ansible-core",
"rhel-system-roles-sap",
// RHBZ#1959813
"bind-utils",
"nfs-utils",
"tcsh",
// RHBZ#1959955
"uuidd",
// RHBZ#1959923
"cairo",
"expect",
"graphviz",
"gtk2",
"iptraf-ng",
"krb5-workstation",
"libaio",
"libatomic",
"libcanberra-gtk2",
"libicu",
"libtool-ltdl",
"lm_sensors",
"net-tools",
"numactl",
"PackageKit-gtk3-module",
"xorg-x11-xauth",
// RHBZ#1960617
"tuned-profiles-sap-hana",
// RHBZ#1961168
"libnsl",
// RHUI client
"rh-amazon-rhui-client-sap-bundle-e4s",
},
})
return ec2SapPackageSet
}.Append(rhelEc2CommonPackageSet(t)).Append(SapPackageSet(t))
}
// common GCE image

41
internal/distro/rhel9/sap.go
View file

@ -3,6 +3,7 @@ package rhel9
import (
"github.com/osbuild/osbuild-composer/internal/distro"
"github.com/osbuild/osbuild-composer/internal/osbuild"
"github.com/osbuild/osbuild-composer/internal/rpmmd"
)
// SapImageConfig returns the SAP specific ImageConfig data
@ -116,3 +117,43 @@ func SapImageConfig(rd distribution) *distro.ImageConfig {
},
}
}
func SapPackageSet(t *imageType) rpmmd.PackageSet {
return rpmmd.PackageSet{
Include: []string{
// RHBZ#2076763
"@Server",
// SAP System Roles
// https://access.redhat.com/sites/default/files/attachments/rhel_system_roles_for_sap_1.pdf
"ansible-core",
"rhel-system-roles-sap",
// RHBZ#1959813
"bind-utils",
"nfs-utils",
"tcsh",
// RHBZ#1959955
"uuidd",
// RHBZ#1959923
"cairo",
"expect",
"graphviz",
"gtk2",
"iptraf-ng",
"krb5-workstation",
"libaio",
"libatomic",
"libcanberra-gtk2",
"libicu",
"libtool-ltdl",
"lm_sensors",
"net-tools",
"numactl",
"PackageKit-gtk3-module",
"xorg-x11-xauth",
// RHBZ#1960617
"tuned-profiles-sap-hana",
// RHBZ#1961168
"libnsl",
},
}
}