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

RHEL-8.5/9.0: keep RHSM DNF plugins enabled on ec2, ec2-ha and ami

Browse source 
The RHSM DNF plugins `product-id` and `subscription-manager` are now
by default enabled on the RHEL-8.5 and RHEL-9.0 `ec2`, `ec2-ha` and
`ami` images.

The desired default state of the RHSM DNF plugins has been decided by
the RHSM team.

Related to https://bugzilla.redhat.com/show_bug.cgi?id=1996670

Signed-off-by: Tomas Hozza <thozza@redhat.com>
This commit is contained in:
Tomas Hozza 2021-09-03 14:58:06 +02:00 • committed by Ondřej Budai
parent ca47083b46
commit 19eb65e9fd
10 changed files with 20 additions and 100 deletions
Download patch file Download diff file Expand all files Collapse all files

4
docs/news/unreleased/rhel-ec2-images-rhsm-dnf-plugins.md Normal file
View file

@ -0,0 +1,4 @@
# RHEL-8.5 / RHEL-9.0: RHSM DNF plugins are now enabled by default on `ec2` and `ami` images
The RHSM DNF plugins `product-id` and `subscription-manager` are now by default enabled
on the RHEL-8.5 and RHEL-9.0 `ec2`, `ec2-ha` and `ami` images.

9
internal/distro/rhel85/pipelines.go
View file

@ -346,15 +346,8 @@ func ec2BaseTreePipeline(repos []rpmmd.RepoConfig, packages []rpmmd.PackageSpec,
WaitForNetwork: true,
}))
} else {
// The EC2 images should keep the RHSM DNF plugins enabled (RHBZ#1996670)
rhsmStageOptions := &osbuild.RHSMStageOptions{
DnfPlugins: &osbuild.RHSMStageOptionsDnfPlugins{
ProductID: &osbuild.RHSMStageOptionsDnfPlugin{
Enabled: false,
},
SubscriptionManager: &osbuild.RHSMStageOptionsDnfPlugin{
Enabled: false,
},
},
// RHBZ#1932802
SubMan: &osbuild.RHSMStageOptionsSubMan{
Rhsmcertd: &osbuild.SubManConfigRHSMCERTDSection{

9
internal/distro/rhel90/pipelines.go
View file

@ -340,15 +340,8 @@ func ec2BaseTreePipeline(repos []rpmmd.RepoConfig, packages []rpmmd.PackageSpec,
WaitForNetwork: true,
}))
} else {
// The EC2 images should keep the RHSM DNF plugins enabled (RHBZ#1996670)
rhsmStageOptions := &osbuild.RHSMStageOptions{
DnfPlugins: &osbuild.RHSMStageOptionsDnfPlugins{
ProductID: &osbuild.RHSMStageOptionsDnfPlugin{
Enabled: false,
},
SubscriptionManager: &osbuild.RHSMStageOptionsDnfPlugin{
Enabled: false,
},
},
// RHBZ#1932802
SubMan: &osbuild.RHSMStageOptionsSubMan{
Rhsmcertd: &osbuild.SubManConfigRHSMCERTDSection{

14
test/data/manifests/rhel_85-aarch64-ami-boot.json
View file

@ -1066,14 +1066,6 @@
{
"type": "org.osbuild.rhsm",
"options": {
"dnf-plugins": {
"product-id": {
"enabled": false
},
"subscription-manager": {
"enabled": false
}
},
"subscription-manager": {
"rhsmcertd": {
"auto_registration": true
@ -10746,10 +10738,10 @@
"rhsm": {
"dnf-plugins": {
"product-id": {
"enabled": false
"enabled": true
},
"subscription-manager": {
"enabled": false
"enabled": true
}
},
"rhsm.conf": {
@ -10799,8 +10791,6 @@
"rpm-verify": {
"changed": {
"/etc/chrony.conf": "S.5....T.",
"/etc/dnf/plugins/product-id.conf": "..5....T.",
"/etc/dnf/plugins/subscription-manager.conf": "..5....T.",
"/etc/machine-id": ".M.......",
"/etc/nsswitch.conf": "....L....",
"/etc/pam.d/fingerprint-auth": "....L....",

14
test/data/manifests/rhel_85-aarch64-ec2-boot.json
View file

@ -1067,14 +1067,6 @@
{
"type": "org.osbuild.rhsm",
"options": {
"dnf-plugins": {
"product-id": {
"enabled": false
},
"subscription-manager": {
"enabled": false
}
},
"subscription-manager": {
"rhsm": {
"manage_repos": false
@ -10786,10 +10778,10 @@
"rhsm": {
"dnf-plugins": {
"product-id": {
"enabled": false
"enabled": true
},
"subscription-manager": {
"enabled": false
"enabled": true
}
},
"rhsm.conf": {
@ -10839,8 +10831,6 @@
"rpm-verify": {
"changed": {
"/etc/chrony.conf": "S.5....T.",
"/etc/dnf/plugins/product-id.conf": "..5....T.",
"/etc/dnf/plugins/subscription-manager.conf": "..5....T.",
"/etc/machine-id": ".M.......",
"/etc/nsswitch.conf": "....L....",
"/etc/pam.d/fingerprint-auth": "....L....",

14
test/data/manifests/rhel_85-x86_64-ami-boot.json
View file

@ -1055,14 +1055,6 @@
{
"type": "org.osbuild.rhsm",
"options": {
"dnf-plugins": {
"product-id": {
"enabled": false
},
"subscription-manager": {
"enabled": false
}
},
"subscription-manager": {
"rhsmcertd": {
"auto_registration": true
@ -10340,10 +10332,10 @@
"rhsm": {
"dnf-plugins": {
"product-id": {
"enabled": false
"enabled": true
},
"subscription-manager": {
"enabled": false
"enabled": true
}
},
"rhsm.conf": {
@ -10393,8 +10385,6 @@
"rpm-verify": {
"changed": {
"/etc/chrony.conf": "S.5....T.",
"/etc/dnf/plugins/product-id.conf": "..5....T.",
"/etc/dnf/plugins/subscription-manager.conf": "..5....T.",
"/etc/machine-id": ".M.......",
"/etc/nsswitch.conf": "....L....",
"/etc/pam.d/fingerprint-auth": "....L....",

14
test/data/manifests/rhel_85-x86_64-ec2-boot.json
View file

@ -1056,14 +1056,6 @@
{
"type": "org.osbuild.rhsm",
"options": {
"dnf-plugins": {
"product-id": {
"enabled": false
},
"subscription-manager": {
"enabled": false
}
},
"subscription-manager": {
"rhsm": {
"manage_repos": false
@ -10380,10 +10372,10 @@
"rhsm": {
"dnf-plugins": {
"product-id": {
"enabled": false
"enabled": true
},
"subscription-manager": {
"enabled": false
"enabled": true
}
},
"rhsm.conf": {
@ -10433,8 +10425,6 @@
"rpm-verify": {
"changed": {
"/etc/chrony.conf": "S.5....T.",
"/etc/dnf/plugins/product-id.conf": "..5....T.",
"/etc/dnf/plugins/subscription-manager.conf": "..5....T.",
"/etc/machine-id": ".M.......",
"/etc/nsswitch.conf": "....L....",
"/etc/pam.d/fingerprint-auth": "....L....",

14
test/data/manifests/rhel_85-x86_64-ec2_ha-boot.json
View file

@ -1230,14 +1230,6 @@
{
"type": "org.osbuild.rhsm",
"options": {
"dnf-plugins": {
"product-id": {
"enabled": false
},
"subscription-manager": {
"enabled": false
}
},
"subscription-manager": {
"rhsm": {
"manage_repos": false
@ -12811,10 +12803,10 @@
"rhsm": {
"dnf-plugins": {
"product-id": {
"enabled": false
"enabled": true
},
"subscription-manager": {
"enabled": false
"enabled": true
}
},
"rhsm.conf": {
@ -12864,8 +12856,6 @@
"rpm-verify": {
"changed": {
"/etc/chrony.conf": "S.5....T.",
"/etc/dnf/plugins/product-id.conf": "..5....T.",
"/etc/dnf/plugins/subscription-manager.conf": "..5....T.",
"/etc/machine-id": ".M.......",
"/etc/nsswitch.conf": "....L....",
"/etc/pam.d/fingerprint-auth": "....L....",

14
test/data/manifests/rhel_90-aarch64-ami-boot.json
View file

@ -968,14 +968,6 @@
{
"type": "org.osbuild.rhsm",
"options": {
"dnf-plugins": {
"product-id": {
"enabled": false
},
"subscription-manager": {
"enabled": false
}
},
"subscription-manager": {
"rhsmcertd": {
"auto_registration": true
@ -9699,10 +9691,10 @@
"rhsm": {
"dnf-plugins": {
"product-id": {
"enabled": false
"enabled": true
},
"subscription-manager": {
"enabled": false
"enabled": true
}
},
"rhsm.conf": {
@ -9753,8 +9745,6 @@
"changed": {
"/boot/efi/EFI": ".M.......",
"/etc/chrony.conf": "S.5....T.",
"/etc/dnf/plugins/product-id.conf": "..5....T.",
"/etc/dnf/plugins/subscription-manager.conf": "..5....T.",
"/etc/nsswitch.conf": "....L....",
"/etc/pam.d/fingerprint-auth": "....L....",
"/etc/pam.d/password-auth": "....L....",

14
test/data/manifests/rhel_90-x86_64-ami-boot.json
View file

@ -953,14 +953,6 @@
{
"type": "org.osbuild.rhsm",
"options": {
"dnf-plugins": {
"product-id": {
"enabled": false
},
"subscription-manager": {
"enabled": false
}
},
"subscription-manager": {
"rhsmcertd": {
"auto_registration": true
@ -9301,10 +9293,10 @@
"rhsm": {
"dnf-plugins": {
"product-id": {
"enabled": false
"enabled": true
},
"subscription-manager": {
"enabled": false
"enabled": true
}
},
"rhsm.conf": {
@ -9354,8 +9346,6 @@
"rpm-verify": {
"changed": {
"/etc/chrony.conf": "S.5....T.",
"/etc/dnf/plugins/product-id.conf": "..5....T.",
"/etc/dnf/plugins/subscription-manager.conf": "..5....T.",
"/etc/nsswitch.conf": "....L....",
"/etc/pam.d/fingerprint-auth": "....L....",
"/etc/pam.d/password-auth": "....L....",