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

RHEL-90: introduce default image config data structure

Browse source 
Introduce a new data structure `ImageConfig` holding the default OS
configuration applied when building an image. The structure can be used
to hold the default image configuration on the distribution level with
possible overrides defined on the image-type level.

As a starting point, move hard-coded default values and configuration
common for `osPipeline`, `ec2BaseTreePipeline` and `ostreeTreePipeline`
to the distribution and image-type default image configuration. This is
preparing the ground for merging all of these three pipeline functions
into `osPipeline`, which will produce the appropriate OS pipeline based
on the image-type configuration and the fact if it is rpmOstree or not.

Regenerate affected EC2 and AMI manifests. There is however no change in
the resulting image configuration and image-info report.

Signed-off-by: Tomas Hozza <thozza@redhat.com>
This commit is contained in:
Tomas Hozza 2021-12-16 13:37:39 +01:00 • committed by Tomáš Hozza
parent 3c729be3c5
commit b200fa8fcd
10 changed files with 526 additions and 243 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -876,17 +876,6 @@
"default_target": "multi-user.target"
}
},
{
"type": "org.osbuild.systemd-logind",
"options": {
"filename": "00-getty-fixes.conf",
"config": {
"Login": {
"NAutoVTs": 0
}
}
}
},
{
"type": "org.osbuild.sysconfig",
"options": {
@ -913,6 +902,17 @@
}
}
},
{
"type": "org.osbuild.systemd-logind",
"options": {
"filename": "00-getty-fixes.conf",
"config": {
"Login": {
"NAutoVTs": 0
}
}
}
},
{
"type": "org.osbuild.cloud-init",
"options": {

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

@ -887,17 +887,6 @@
"default_target": "multi-user.target"
}
},
{
"type": "org.osbuild.systemd-logind",
"options": {
"filename": "00-getty-fixes.conf",
"config": {
"Login": {
"NAutoVTs": 0
}
}
}
},
{
"type": "org.osbuild.sysconfig",
"options": {
@ -924,6 +913,17 @@
}
}
},
{
"type": "org.osbuild.systemd-logind",
"options": {
"filename": "00-getty-fixes.conf",
"config": {
"Login": {
"NAutoVTs": 0
}
}
}
},
{
"type": "org.osbuild.cloud-init",
"options": {

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

@ -859,17 +859,6 @@
"default_target": "multi-user.target"
}
},
{
"type": "org.osbuild.systemd-logind",
"options": {
"filename": "00-getty-fixes.conf",
"config": {
"Login": {
"NAutoVTs": 0
}
}
}
},
{
"type": "org.osbuild.sysconfig",
"options": {
@ -896,6 +885,17 @@
}
}
},
{
"type": "org.osbuild.systemd-logind",
"options": {
"filename": "00-getty-fixes.conf",
"config": {
"Login": {
"NAutoVTs": 0
}
}
}
},
{
"type": "org.osbuild.cloud-init",
"options": {

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

@ -872,17 +872,6 @@
"default_target": "multi-user.target"
}
},
{
"type": "org.osbuild.systemd-logind",
"options": {
"filename": "00-getty-fixes.conf",
"config": {
"Login": {
"NAutoVTs": 0
}
}
}
},
{
"type": "org.osbuild.sysconfig",
"options": {
@ -909,6 +898,17 @@
}
}
},
{
"type": "org.osbuild.systemd-logind",
"options": {
"filename": "00-getty-fixes.conf",
"config": {
"Login": {
"NAutoVTs": 0
}
}
}
},
{
"type": "org.osbuild.cloud-init",
"options": {

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

@ -1066,17 +1066,6 @@
"default_target": "multi-user.target"
}
},
{
"type": "org.osbuild.systemd-logind",
"options": {
"filename": "00-getty-fixes.conf",
"config": {
"Login": {
"NAutoVTs": 0
}
}
}
},
{
"type": "org.osbuild.sysconfig",
"options": {
@ -1103,6 +1092,17 @@
}
}
},
{
"type": "org.osbuild.systemd-logind",
"options": {
"filename": "00-getty-fixes.conf",
"config": {
"Login": {
"NAutoVTs": 0
}
}
}
},
{
"type": "org.osbuild.cloud-init",
"options": {

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

@ -1120,17 +1120,6 @@
"default_target": "multi-user.target"
}
},
{
"type": "org.osbuild.systemd-logind",
"options": {
"filename": "00-getty-fixes.conf",
"config": {
"Login": {
"NAutoVTs": 0
}
}
}
},
{
"type": "org.osbuild.sysconfig",
"options": {
@ -1157,6 +1146,17 @@
}
}
},
{
"type": "org.osbuild.systemd-logind",
"options": {
"filename": "00-getty-fixes.conf",
"config": {
"Login": {
"NAutoVTs": 0
}
}
}
},
{
"type": "org.osbuild.cloud-init",
"options": {