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

distro: Disable RHSM DNF plugins on RHEL qcow2 images

Browse source 
Modify RHEL 8.3 and 8.4 KVM guest images definition to produce osbuild
manifest with `org.osbuild.rhsm` stage to disable both RHSM DNF plugins
(`product-id` and `subscription-manager`).

Update `/docs/news/unreleased/osbuild-rhsm-stage.md` to note that RHEL
8.3 and 8.4 qcow2 image definitions are updated to disable RHSM DNF
plugins by default.

Enhance `tools/image-info` tool to add RHSM-specific section to its
output in case RHSM DNF plugins configurations exist in the tree.

Regenerate all RHEL image test cases affected by the patch set.

Signed-off-by: Tomas Hozza <thozza@redhat.com>
This commit is contained in:
Tomas Hozza 2021-02-09 17:22:47 +01:00 • committed by Ondřej Budai
parent 1d48c92953
commit af3c572f9a
27 changed files with 937 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

49
test/data/manifests/rhel_8-ppc64le-qcow2-boot.json
View file

@ -2074,6 +2074,9 @@
{
"checksum": "sha256:af6d0c925a95f2b23843fcce53f1eff0b449db44ff362dc2d7d62bb6dff0a553"
},
{
"checksum": "sha256:9a6eb680e8debcd0b97575a76e9cf0d0655ef7f875b362542e0d129f5e423419"
},
{
"checksum": "sha256:0396d12973b68a7d16074aa51f75e706c0b7558cd24d32e5573c49a487b2497c"
},
@ -2095,6 +2098,9 @@
{
"checksum": "sha256:1ed3940c0466986fa38fe9d3bd5fc6370b5e62edba51f7a8359eab786b4b81ec"
},
{
"checksum": "sha256:932cca0b2aa28d64538fca0401acc35bec34f14bfe99d3e22ea8452b79890eac"
},
{
"checksum": "sha256:d8ba6a91610d87dfb599018c887514af663a0f963ed6b25a83bac8fba56fa266"
},
@ -3762,6 +3768,19 @@
"options": {
"file_contexts": "etc/selinux/targeted/contexts/files/file_contexts"
}
},
{
"name": "org.osbuild.rhsm",
"options": {
"dnf-plugins": {
"product-id": {
"enabled": false
},
"subscription-manager": {
"enabled": false
}
}
}
}
],
"assembler": {
@ -5355,6 +5374,15 @@
"remote_location": "https://rpmrepo.osbuild.org/v1/psi/el8/el8-ppc64le-baseos-8.3.0.r-20210120/Packages/python3-hawkey-0.48.0-5.el8.ppc64le.rpm",
"checksum": "sha256:af6d0c925a95f2b23843fcce53f1eff0b449db44ff362dc2d7d62bb6dff0a553"
},
{
"name": "python3-iniparse",
"epoch": 0,
"version": "0.4",
"release": "31.el8",
"arch": "noarch",
"remote_location": "https://rpmrepo.osbuild.org/v1/psi/el8/el8-ppc64le-baseos-8.3.0.r-20210120/Packages/python3-iniparse-0.4-31.el8.noarch.rpm",
"checksum": "sha256:9a6eb680e8debcd0b97575a76e9cf0d0655ef7f875b362542e0d129f5e423419"
},
{
"name": "python3-libcomps",
"epoch": 0,
@ -5418,6 +5446,15 @@
"remote_location": "https://rpmrepo.osbuild.org/v1/psi/el8/el8-ppc64le-baseos-8.3.0.r-20210120/Packages/python3-setuptools-wheel-39.2.0-6.el8.noarch.rpm",
"checksum": "sha256:1ed3940c0466986fa38fe9d3bd5fc6370b5e62edba51f7a8359eab786b4b81ec"
},
{
"name": "python3-six",
"epoch": 0,
"version": "1.11.0",
"release": "8.el8",
"arch": "noarch",
"remote_location": "https://rpmrepo.osbuild.org/v1/psi/el8/el8-ppc64le-baseos-8.3.0.r-20210120/Packages/python3-six-1.11.0-8.el8.noarch.rpm",
"checksum": "sha256:932cca0b2aa28d64538fca0401acc35bec34f14bfe99d3e22ea8452b79890eac"
},
{
"name": "readline",
"epoch": 0,
@ -10867,8 +10904,20 @@
"tss:x:59:59:Account used by the trousers package to sandbox the tcsd daemon:/dev/null:/sbin/nologin",
"unbound:x:997:993:Unbound DNS resolver:/etc/unbound:/sbin/nologin"
],
"rhsm": {
"dnf-plugins": {
"product-id": {
"enabled": false
},
"subscription-manager": {
"enabled": false
}
}
},
"rpm-verify": {
"changed": {
"/etc/dnf/plugins/product-id.conf": "..5....T.",
"/etc/dnf/plugins/subscription-manager.conf": "..5....T.",
"/etc/machine-id": ".M.......",
"/proc": ".M.......",
"/sys": ".M.......",