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

internal/distro/rhel9: enable ignition on 9+

Browse source 
Signed-off-by: Antonio Murdaca <antoniomurdaca@gmail.com>
This commit is contained in:
Antonio Murdaca 2023-02-06 17:45:01 +01:00 • committed by Achilleas Koutsou
parent 5ab00987cd
commit b8ddbd3031
11 changed files with 70 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

9
internal/distro/rhel9/images.go
View file

@ -340,6 +340,10 @@ func edgeRawImage(workload workload.Workload,
Checksum: options.OSTree.FetchChecksum,
}
img := image.NewOSTreeRawImage(commit)
// TODO: add Fedora once it's ready
if !common.VersionLessThan(t.arch.distro.osVersion, "9.2") || t.arch.distro.osVersion == "9-stream" {
img.Ignition = true
}
img.Users = users.UsersFromBP(customizations.GetUsers())
img.Groups = users.GroupsFromBP(customizations.GetGroups())
@ -396,7 +400,10 @@ func edgeSimplifiedInstallerImage(workload workload.Workload,
Checksum: options.OSTree.FetchChecksum,
}
rawImg := image.NewOSTreeRawImage(commit)
rawImg.Ignition = true
// TODO: add Fedora once it's ready
if !common.VersionLessThan(t.arch.distro.osVersion, "9.2") || t.arch.distro.osVersion == "9-stream" {
rawImg.Ignition = true
}
rawImg.Users = users.UsersFromBP(customizations.GetUsers())
rawImg.Groups = users.GroupsFromBP(customizations.GetGroups())

14
test/data/manifests/centos_9-aarch64-edge_raw_image-boot.json
View file

@ -2167,7 +2167,10 @@
"kernel_opts": [
"luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
"modprobe.blacklist=vc4",
"rw"
"rw",
"coreos.no_persist_ip",
"ignition.platform.id=metal",
"$ignition_firstboot"
]
}
},
@ -2258,6 +2261,10 @@
}
]
},
{
"type": "org.osbuild.ignition",
"options": {}
},
{
"type": "org.osbuild.users",
"options": {
@ -2324,7 +2331,7 @@
"options": {
"root_fs_uuid": "fb180daf-48a7-4ee0-b10d-394651850fd4",
"boot_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
"kernel_opts": "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75,modprobe.blacklist=vc4,rw",
"kernel_opts": "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75,modprobe.blacklist=vc4,rw,coreos.no_persist_ip,ignition.platform.id=metal,$ignition_firstboot",
"uefi": {
"vendor": "centos",
"install": true,
@ -2338,7 +2345,8 @@
"console"
],
"timeout": 1
}
},
"ignition": true
},
"mounts": [
{

14
test/data/manifests/centos_9-x86_64-edge_raw_image-boot.json
View file

@ -2294,7 +2294,10 @@
"kernel_opts": [
"luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
"modprobe.blacklist=vc4",
"rw"
"rw",
"coreos.no_persist_ip",
"ignition.platform.id=metal",
"$ignition_firstboot"
]
}
},
@ -2385,6 +2388,10 @@
}
]
},
{
"type": "org.osbuild.ignition",
"options": {}
},
{
"type": "org.osbuild.users",
"options": {
@ -2451,7 +2458,7 @@
"options": {
"root_fs_uuid": "fb180daf-48a7-4ee0-b10d-394651850fd4",
"boot_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
"kernel_opts": "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75,modprobe.blacklist=vc4,rw",
"kernel_opts": "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75,modprobe.blacklist=vc4,rw,coreos.no_persist_ip,ignition.platform.id=metal,$ignition_firstboot",
"legacy": "i386-pc",
"uefi": {
"vendor": "centos",
@ -2466,7 +2473,8 @@
"console"
],
"timeout": 1
}
},
"ignition": true
},
"mounts": [
{

14
test/data/manifests/rhel_9-aarch64-edge_simplified_installer-boot.json
View file

@ -2616,10 +2616,7 @@
"kernel_opts": [
"luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
"modprobe.blacklist=vc4",
"rw",
"coreos.no_persist_ip",
"ignition.platform.id=metal",
"$ignition_firstboot"
"rw"
]
}
},
@ -2710,10 +2707,6 @@
}
]
},
{
"type": "org.osbuild.ignition",
"options": {}
},
{
"type": "org.osbuild.users",
"options": {
@ -2780,7 +2773,7 @@
"options": {
"root_fs_uuid": "fb180daf-48a7-4ee0-b10d-394651850fd4",
"boot_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
"kernel_opts": "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75,modprobe.blacklist=vc4,rw,coreos.no_persist_ip,ignition.platform.id=metal,$ignition_firstboot",
"kernel_opts": "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75,modprobe.blacklist=vc4,rw",
"uefi": {
"vendor": "redhat",
"install": true,
@ -2794,8 +2787,7 @@
"console"
],
"timeout": 1
},
"ignition": true
}
},
"mounts": [
{

14
test/data/manifests/rhel_9-x86_64-edge_simplified_installer-boot.json
View file

@ -2664,10 +2664,7 @@
"kernel_opts": [
"luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
"modprobe.blacklist=vc4",
"rw",
"coreos.no_persist_ip",
"ignition.platform.id=metal",
"$ignition_firstboot"
"rw"
]
}
},
@ -2758,10 +2755,6 @@
}
]
},
{
"type": "org.osbuild.ignition",
"options": {}
},
{
"type": "org.osbuild.users",
"options": {
@ -2828,7 +2821,7 @@
"options": {
"root_fs_uuid": "fb180daf-48a7-4ee0-b10d-394651850fd4",
"boot_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
"kernel_opts": "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75,modprobe.blacklist=vc4,rw,coreos.no_persist_ip,ignition.platform.id=metal,$ignition_firstboot",
"kernel_opts": "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75,modprobe.blacklist=vc4,rw",
"uefi": {
"vendor": "redhat",
"install": true,
@ -2842,8 +2835,7 @@
"console"
],
"timeout": 1
},
"ignition": true
}
},
"mounts": [
{

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

@ -986,10 +986,7 @@
"kernel_opts": [
"luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
"modprobe.blacklist=vc4",
"rw",
"coreos.no_persist_ip",
"ignition.platform.id=metal",
"$ignition_firstboot"
"rw"
]
}
},
@ -1080,10 +1077,6 @@
}
]
},
{
"type": "org.osbuild.ignition",
"options": {}
},
{
"type": "org.osbuild.users",
"options": {
@ -1150,7 +1143,7 @@
"options": {
"root_fs_uuid": "fb180daf-48a7-4ee0-b10d-394651850fd4",
"boot_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
"kernel_opts": "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75,modprobe.blacklist=vc4,rw,coreos.no_persist_ip,ignition.platform.id=metal,$ignition_firstboot",
"kernel_opts": "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75,modprobe.blacklist=vc4,rw",
"uefi": {
"vendor": "redhat",
"install": true,
@ -1164,8 +1157,7 @@
"console"
],
"timeout": 1
},
"ignition": true
}
},
"mounts": [
{

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

@ -1007,10 +1007,7 @@
"kernel_opts": [
"luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
"modprobe.blacklist=vc4",
"rw",
"coreos.no_persist_ip",
"ignition.platform.id=metal",
"$ignition_firstboot"
"rw"
]
}
},
@ -1101,10 +1098,6 @@
}
]
},
{
"type": "org.osbuild.ignition",
"options": {}
},
{
"type": "org.osbuild.users",
"options": {
@ -1171,7 +1164,7 @@
"options": {
"root_fs_uuid": "fb180daf-48a7-4ee0-b10d-394651850fd4",
"boot_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
"kernel_opts": "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75,modprobe.blacklist=vc4,rw,coreos.no_persist_ip,ignition.platform.id=metal,$ignition_firstboot",
"kernel_opts": "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75,modprobe.blacklist=vc4,rw",
"uefi": {
"vendor": "redhat",
"install": true,
@ -1185,8 +1178,7 @@
"console"
],
"timeout": 1
},
"ignition": true
}
},
"mounts": [
{

14
test/data/manifests/rhel_91-aarch64-edge_simplified_installer-boot.json
View file

@ -2616,10 +2616,7 @@
"kernel_opts": [
"luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
"modprobe.blacklist=vc4",
"rw",
"coreos.no_persist_ip",
"ignition.platform.id=metal",
"$ignition_firstboot"
"rw"
]
}
},
@ -2710,10 +2707,6 @@
}
]
},
{
"type": "org.osbuild.ignition",
"options": {}
},
{
"type": "org.osbuild.users",
"options": {
@ -2780,7 +2773,7 @@
"options": {
"root_fs_uuid": "fb180daf-48a7-4ee0-b10d-394651850fd4",
"boot_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
"kernel_opts": "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75,modprobe.blacklist=vc4,rw,coreos.no_persist_ip,ignition.platform.id=metal,$ignition_firstboot",
"kernel_opts": "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75,modprobe.blacklist=vc4,rw",
"uefi": {
"vendor": "redhat",
"install": true,
@ -2794,8 +2787,7 @@
"console"
],
"timeout": 1
},
"ignition": true
}
},
"mounts": [
{

14
test/data/manifests/rhel_91-x86_64-edge_simplified_installer-boot.json
View file

@ -2664,10 +2664,7 @@
"kernel_opts": [
"luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
"modprobe.blacklist=vc4",
"rw",
"coreos.no_persist_ip",
"ignition.platform.id=metal",
"$ignition_firstboot"
"rw"
]
}
},
@ -2758,10 +2755,6 @@
}
]
},
{
"type": "org.osbuild.ignition",
"options": {}
},
{
"type": "org.osbuild.users",
"options": {
@ -2828,7 +2821,7 @@
"options": {
"root_fs_uuid": "fb180daf-48a7-4ee0-b10d-394651850fd4",
"boot_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
"kernel_opts": "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75,modprobe.blacklist=vc4,rw,coreos.no_persist_ip,ignition.platform.id=metal,$ignition_firstboot",
"kernel_opts": "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75,modprobe.blacklist=vc4,rw",
"uefi": {
"vendor": "redhat",
"install": true,
@ -2842,8 +2835,7 @@
"console"
],
"timeout": 1
},
"ignition": true
}
},
"mounts": [
{

14
test/data/manifests/rhel_92-aarch64-edge_raw_image-boot.json
View file

@ -2175,7 +2175,10 @@
"kernel_opts": [
"luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
"modprobe.blacklist=vc4",
"rw"
"rw",
"coreos.no_persist_ip",
"ignition.platform.id=metal",
"$ignition_firstboot"
]
}
},
@ -2266,6 +2269,10 @@
}
]
},
{
"type": "org.osbuild.ignition",
"options": {}
},
{
"type": "org.osbuild.users",
"options": {
@ -2332,7 +2339,7 @@
"options": {
"root_fs_uuid": "fb180daf-48a7-4ee0-b10d-394651850fd4",
"boot_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
"kernel_opts": "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75,modprobe.blacklist=vc4,rw",
"kernel_opts": "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75,modprobe.blacklist=vc4,rw,coreos.no_persist_ip,ignition.platform.id=metal,$ignition_firstboot",
"uefi": {
"vendor": "redhat",
"install": true,
@ -2346,7 +2353,8 @@
"console"
],
"timeout": 1
}
},
"ignition": true
},
"mounts": [
{

14
test/data/manifests/rhel_92-x86_64-edge_raw_image-boot.json
View file

@ -2295,7 +2295,10 @@
"kernel_opts": [
"luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
"modprobe.blacklist=vc4",
"rw"
"rw",
"coreos.no_persist_ip",
"ignition.platform.id=metal",
"$ignition_firstboot"
]
}
},
@ -2386,6 +2389,10 @@
}
]
},
{
"type": "org.osbuild.ignition",
"options": {}
},
{
"type": "org.osbuild.users",
"options": {
@ -2452,7 +2459,7 @@
"options": {
"root_fs_uuid": "fb180daf-48a7-4ee0-b10d-394651850fd4",
"boot_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
"kernel_opts": "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75,modprobe.blacklist=vc4,rw",
"kernel_opts": "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75,modprobe.blacklist=vc4,rw,coreos.no_persist_ip,ignition.platform.id=metal,$ignition_firstboot",
"legacy": "i386-pc",
"uefi": {
"vendor": "redhat",
@ -2467,7 +2474,8 @@
"console"
],
"timeout": 1
}
},
"ignition": true
},
"mounts": [
{