Skip to content

Commit 7f296b7

Browse files
lzaplzap
committed
distrodefs: allow firstboot customization (HMS-9187)
Also add cacerts to ostree image types where firstboot is allowed and cacerts was missing.
1 parent 52e451a commit 7f296b7

5 files changed

Lines changed: 30 additions & 0 deletions

File tree

‎data/distrodefs/fedora/imagetypes.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1077,6 +1077,7 @@
10771077
- "customizations.disk"
10781078
- "customizations.files"
10791079
- "customizations.filesystem"
1080+
- "customizations.firstboot"
10801081
- "customizations.partitioning_mode"
10811082
- "customizations.fips"
10821083
- "customizations.firewall"
@@ -1164,6 +1165,7 @@
11641165
- "customizations.files"
11651166
- "customizations.fips"
11661167
- "customizations.firewall"
1168+
- "customizations.firstboot"
11671169
- "customizations.user"
11681170
- "customizations.sshkey"
11691171
- "customizations.group"
@@ -2269,9 +2271,11 @@ image_types:
22692271
- "containers"
22702272
- "customizations.installer"
22712273
- "customizations.cacerts"
2274+
- "customizations.firstboot"
22722275
- "customizations.directories"
22732276
- "customizations.files"
22742277
- "customizations.firewall"
2278+
- "customizations.firstboot"
22752279
- "customizations.user"
22762280
- "customizations.sshkey"
22772281
- "customizations.group"

‎data/distrodefs/rhel-10/imagetypes.yaml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -853,6 +853,7 @@
853853
- "customizations.dnf"
854854
- "customizations.files"
855855
- "customizations.filesystem"
856+
- "customizations.firstboot"
856857
- "customizations.partitioning_mode"
857858
- "customizations.fips"
858859
- "customizations.firewall"
@@ -884,6 +885,7 @@
884885
- "customizations.files"
885886
- "customizations.fips"
886887
- "customizations.firewall"
888+
- "customizations.firstboot"
887889
- "customizations.user"
888890
- "customizations.sshkey"
889891
- "customizations.group"
@@ -905,9 +907,11 @@
905907
- "groups"
906908
- "enabled_modules"
907909
- "containers"
910+
- "customizations.cacerts"
908911
- "customizations.directories"
909912
- "customizations.files"
910913
- "customizations.firewall"
914+
- "customizations.firstboot"
911915
- "customizations.user"
912916
- "customizations.sshkey"
913917
- "customizations.group"
@@ -1410,6 +1414,7 @@ image_types:
14101414
- "customizations.dnf"
14111415
- "customizations.files"
14121416
- "customizations.firewall"
1417+
- "customizations.firstboot"
14131418
- "customizations.user"
14141419
- "customizations.sshkey"
14151420
- "customizations.group"
@@ -1933,10 +1938,12 @@ image_types:
19331938
- "groups"
19341939
- "enabled_modules"
19351940
- "containers"
1941+
- "customizations.cacerts"
19361942
- "customizations.dnf"
19371943
- "customizations.directories"
19381944
- "customizations.files"
19391945
- "customizations.firewall"
1946+
- "customizations.firstboot"
19401947
- "customizations.user"
19411948
- "customizations.sshkey"
19421949
- "customizations.group"
@@ -2116,6 +2123,7 @@ image_types:
21162123
- "customizations.directories"
21172124
- "customizations.files"
21182125
- "customizations.firewall"
2126+
- "customizations.firstboot"
21192127
- "customizations.user"
21202128
- "customizations.sshkey"
21212129
- "customizations.group"
@@ -2383,6 +2391,7 @@ image_types:
23832391
- "customizations.dnf"
23842392
- "customizations.files"
23852393
- "customizations.filesystem"
2394+
- "customizations.firstboot"
23862395
- "customizations.partitioning_mode"
23872396
- "customizations.fips"
23882397
- "customizations.firewall"

‎data/distrodefs/rhel-7/imagetypes.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,7 @@
221221
- "customizations.disk"
222222
- "customizations.files"
223223
- "customizations.filesystem"
224+
- "customizations.firstboot"
224225
- "customizations.partitioning_mode"
225226
- "customizations.fips"
226227
- "customizations.firewall"

‎data/distrodefs/rhel-8/imagetypes.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1262,6 +1262,7 @@
12621262
- "customizations.dnf"
12631263
- "customizations.files"
12641264
- "customizations.filesystem"
1265+
- "customizations.firstboot"
12651266
- "customizations.partitioning_mode"
12661267
- "customizations.fips"
12671268
- "customizations.firewall"
@@ -1287,11 +1288,13 @@
12871288
- "groups"
12881289
- "enabled_modules"
12891290
- "containers"
1291+
- "customizations.cacerts"
12901292
- "customizations.dnf"
12911293
- "customizations.directories"
12921294
- "customizations.files"
12931295
- "customizations.fips"
12941296
- "customizations.firewall"
1297+
- "customizations.firstboot"
12951298
- "customizations.user"
12961299
- "customizations.sshkey"
12971300
- "customizations.group"
@@ -1306,11 +1309,13 @@
13061309
# options supported by ostree disk (deployment) image types
13071310
supported_options_ostree_disk: &supported_options_ostree_disk
13081311
- "distro"
1312+
- "customizations.cacerts"
13091313
- "customizations.files"
13101314
- "customizations.directories"
13111315
- "customizations.disk"
13121316
- "customizations.dnf"
13131317
- "customizations.filesystem"
1318+
- "customizations.firstboot"
13141319
- "customizations.partitioning_mode"
13151320
- "customizations.fips"
13161321
- "customizations.user"

‎data/distrodefs/rhel-9/imagetypes.yaml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1290,6 +1290,7 @@
12901290
- "customizations.dnf"
12911291
- "customizations.files"
12921292
- "customizations.filesystem"
1293+
- "customizations.firstboot"
12931294
- "customizations.partitioning_mode"
12941295
- "customizations.fips"
12951296
- "customizations.firewall"
@@ -1315,11 +1316,13 @@
13151316
- "groups"
13161317
- "enabled_modules"
13171318
- "containers"
1319+
- "customizations.cacerts"
13181320
- "customizations.dnf"
13191321
- "customizations.directories"
13201322
- "customizations.files"
13211323
- "customizations.fips"
13221324
- "customizations.firewall"
1325+
- "customizations.firstboot"
13231326
- "customizations.user"
13241327
- "customizations.sshkey"
13251328
- "customizations.group"
@@ -1334,11 +1337,13 @@
13341337
# options supported by ostree disk (deployment) image types
13351338
supported_options_ostree_disk: &supported_options_ostree_disk
13361339
- "distro"
1340+
- "customizations.cacerts"
13371341
- "customizations.files"
13381342
- "customizations.directories"
13391343
- "customizations.disk"
13401344
- "customizations.dnf"
13411345
- "customizations.filesystem"
1346+
- "customizations.firstboot"
13421347
- "customizations.partitioning_mode"
13431348
- "customizations.fips"
13441349
- "customizations.user"
@@ -1362,6 +1367,7 @@
13621367
- "customizations.files"
13631368
- "customizations.fips"
13641369
- "customizations.firewall"
1370+
- "customizations.firstboot"
13651371
- "customizations.user"
13661372
- "customizations.sshkey"
13671373
- "customizations.group"
@@ -1383,9 +1389,11 @@
13831389
- "groups"
13841390
- "enabled_modules"
13851391
- "containers"
1392+
- "customizations.cacerts"
13861393
- "customizations.directories"
13871394
- "customizations.files"
13881395
- "customizations.firewall"
1396+
- "customizations.firstboot"
13891397
- "customizations.user"
13901398
- "customizations.sshkey"
13911399
- "customizations.group"
@@ -3259,9 +3267,11 @@ image_types:
32593267
blueprint:
32603268
supported_options:
32613269
- "distro"
3270+
- "customizations.cacerts"
32623271
- "customizations.dnf"
32633272
- "customizations.installation_device"
32643273
- "customizations.filesystem"
3274+
- "customizations.firstboot"
32653275
- "customizations.disk"
32663276
- "customizations.fdo"
32673277
- "customizations.ignition"
@@ -3450,6 +3460,7 @@ image_types:
34503460
- "customizations.dnf"
34513461
- "customizations.files"
34523462
- "customizations.filesystem"
3463+
- "customizations.firstboot"
34533464
- "customizations.partitioning_mode"
34543465
- "customizations.fips"
34553466
- "customizations.firewall"

0 commit comments

Comments
 (0)