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

RHEL-90: move RHSM configuration to ImageConfig structure

Browse source 
Move the RHSM configuration settings to `ImageConfig` structure and use
when handling subscriptions in `osPipeline`, `ec2BaseTreePipeline` and
`ostreeTreePipeline` functions.

Regenerate image test cases. While there are changed in the manifests,
the actual image configuration didn't change at all and thus the
`image-info` report was not changed.

Signed-off-by: Tomas Hozza <thozza@redhat.com>
This commit is contained in:
Tomas Hozza 2021-12-16 21:44:41 +01:00 • committed by Tomáš Hozza
parent b200fa8fcd
commit 8130c892f0
10 changed files with 278 additions and 165 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -902,6 +902,16 @@
}
}
},
{
"type": "org.osbuild.rhsm",
"options": {
"subscription-manager": {
"rhsmcertd": {
"auto_registration": true
}
}
}
},
{
"type": "org.osbuild.systemd-logind",
"options": {
@ -967,16 +977,6 @@
"profile": "sssd"
}
},
{
"type": "org.osbuild.rhsm",
"options": {
"subscription-manager": {
"rhsmcertd": {
"auto_registration": true
}
}
}
},
{
"type": "org.osbuild.fstab",
"options": {

26
test/data/manifests/rhel_90-aarch64-ec2-boot.json
View file

@ -913,6 +913,19 @@
}
}
},
{
"type": "org.osbuild.rhsm",
"options": {
"subscription-manager": {
"rhsm": {
"manage_repos": false
},
"rhsmcertd": {
"auto_registration": true
}
}
}
},
{
"type": "org.osbuild.systemd-logind",
"options": {
@ -978,19 +991,6 @@
"profile": "sssd"
}
},
{
"type": "org.osbuild.rhsm",
"options": {
"subscription-manager": {
"rhsm": {
"manage_repos": false
},
"rhsmcertd": {
"auto_registration": true
}
}
}
},
{
"type": "org.osbuild.fstab",
"options": {

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

@ -885,6 +885,16 @@
}
}
},
{
"type": "org.osbuild.rhsm",
"options": {
"subscription-manager": {
"rhsmcertd": {
"auto_registration": true
}
}
}
},
{
"type": "org.osbuild.systemd-logind",
"options": {
@ -950,16 +960,6 @@
"profile": "sssd"
}
},
{
"type": "org.osbuild.rhsm",
"options": {
"subscription-manager": {
"rhsmcertd": {
"auto_registration": true
}
}
}
},
{
"type": "org.osbuild.dracut.conf",
"options": {

26
test/data/manifests/rhel_90-x86_64-ec2-boot.json
View file

@ -898,6 +898,19 @@
}
}
},
{
"type": "org.osbuild.rhsm",
"options": {
"subscription-manager": {
"rhsm": {
"manage_repos": false
},
"rhsmcertd": {
"auto_registration": true
}
}
}
},
{
"type": "org.osbuild.systemd-logind",
"options": {
@ -963,19 +976,6 @@
"profile": "sssd"
}
},
{
"type": "org.osbuild.rhsm",
"options": {
"subscription-manager": {
"rhsm": {
"manage_repos": false
},
"rhsmcertd": {
"auto_registration": true
}
}
}
},
{
"type": "org.osbuild.dracut.conf",
"options": {

26
test/data/manifests/rhel_90-x86_64-ec2_ha-boot.json
View file

@ -1092,6 +1092,19 @@
}
}
},
{
"type": "org.osbuild.rhsm",
"options": {
"subscription-manager": {
"rhsm": {
"manage_repos": false
},
"rhsmcertd": {
"auto_registration": true
}
}
}
},
{
"type": "org.osbuild.systemd-logind",
"options": {
@ -1157,19 +1170,6 @@
"profile": "sssd"
}
},
{
"type": "org.osbuild.rhsm",
"options": {
"subscription-manager": {
"rhsm": {
"manage_repos": false
},
"rhsmcertd": {
"auto_registration": true
}
}
}
},
{
"type": "org.osbuild.dracut.conf",
"options": {

26
test/data/manifests/rhel_90-x86_64-ec2_sap-boot.json
View file

@ -1146,6 +1146,19 @@
}
}
},
{
"type": "org.osbuild.rhsm",
"options": {
"subscription-manager": {
"rhsm": {
"manage_repos": false
},
"rhsmcertd": {
"auto_registration": true
}
}
}
},
{
"type": "org.osbuild.systemd-logind",
"options": {
@ -1211,19 +1224,6 @@
"profile": "sssd"
}
},
{
"type": "org.osbuild.rhsm",
"options": {
"subscription-manager": {
"rhsm": {
"manage_repos": false
},
"rhsmcertd": {
"auto_registration": true
}
}
}
},
{
"type": "org.osbuild.dracut.conf",
"options": {