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

distro/rhel90: enable cloud-init

Browse source 
cloud-init was enabled explicitly in the image-factory kickstart and thus we
need to explicitly enable it too.

Fixes: rhbz#1960309
Fixes: COMPOSER-920
Signed-off-by: Ondřej Budai <ondrej@budai.cz>
This commit is contained in:
Ondřej Budai 2021-05-14 13:10:11 +02:00 • committed by Ondřej Budai
parent bb60905309
commit a19b883727
5 changed files with 54 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

6
internal/distro/rhel90/distro.go
View file

@ -822,6 +822,12 @@ func newDistro(name string) distro.Distro {
"rng-tools",
"udisks2",
},
enabledServices: []string{
"cloud-init.service",
"cloud-config.service",
"cloud-final.service",
"cloud-init-local.service",
},
defaultTarget: "multi-user.target",
kernelOptions: "console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto",
bootable: true,

18
test/data/manifests/rhel_90-aarch64-qcow2-boot.json
View file

@ -3453,6 +3453,12 @@
{
"name": "org.osbuild.systemd",
"options": {
"enabled_services": [
"cloud-init.service",
"cloud-config.service",
"cloud-final.service",
"cloud-init-local.service"
],
"default_target": "multi-user.target"
}
},
@ -9570,8 +9576,8 @@
],
"hostname": "localhost.localdomain",
"image-format": {
"type": "qcow2",
"compat": "1.1"
"compat": "1.1",
"type": "qcow2"
},
"os-release": {
"ANSI_COLOR": "0;31",
@ -10128,10 +10134,6 @@
"services-disabled": [
"arp-ethers.service",
"chrony-wait.service",
"cloud-config.service",
"cloud-final.service",
"cloud-init-local.service",
"cloud-init.service",
"cockpit.socket",
"console-getty.service",
"cpupower.service",
@ -10181,6 +10183,10 @@
"auditd.service",
"autovt@.service",
"chronyd.service",
"cloud-config.service",
"cloud-final.service",
"cloud-init-local.service",
"cloud-init.service",
"crond.service",
"ctrl-alt-del.target",
"dbus-broker.service",

18
test/data/manifests/rhel_90-ppc64le-qcow2-boot.json
View file

@ -3747,6 +3747,12 @@
{
"name": "org.osbuild.systemd",
"options": {
"enabled_services": [
"cloud-init.service",
"cloud-config.service",
"cloud-final.service",
"cloud-init-local.service"
],
"default_target": "multi-user.target"
}
},
@ -10321,8 +10327,8 @@
],
"hostname": "localhost.localdomain",
"image-format": {
"type": "qcow2",
"compat": "1.1"
"compat": "1.1",
"type": "qcow2"
},
"os-release": {
"ANSI_COLOR": "0;31",
@ -10922,10 +10928,6 @@
"services-disabled": [
"arp-ethers.service",
"chrony-wait.service",
"cloud-config.service",
"cloud-final.service",
"cloud-init-local.service",
"cloud-init.service",
"cockpit.socket",
"console-getty.service",
"cpupower.service",
@ -10976,6 +10978,10 @@
"auditd.service",
"autovt@.service",
"chronyd.service",
"cloud-config.service",
"cloud-final.service",
"cloud-init-local.service",
"cloud-init.service",
"crond.service",
"ctrl-alt-del.target",
"dbus-broker.service",

18
test/data/manifests/rhel_90-s390x-qcow2-boot.json
View file

@ -3567,6 +3567,12 @@
{
"name": "org.osbuild.systemd",
"options": {
"enabled_services": [
"cloud-init.service",
"cloud-config.service",
"cloud-final.service",
"cloud-init-local.service"
],
"default_target": "multi-user.target"
}
},
@ -9776,8 +9782,8 @@
],
"hostname": "localhost.localdomain",
"image-format": {
"type": "qcow2",
"compat": "1.1"
"compat": "1.1",
"type": "qcow2"
},
"os-release": {
"ANSI_COLOR": "0;31",
@ -10350,10 +10356,6 @@
"services-disabled": [
"arp-ethers.service",
"chrony-wait.service",
"cloud-config.service",
"cloud-final.service",
"cloud-init-local.service",
"cloud-init.service",
"cockpit.socket",
"console-getty.service",
"debug-shell.service",
@ -10402,6 +10404,10 @@
"auditd.service",
"autovt@.service",
"chronyd.service",
"cloud-config.service",
"cloud-final.service",
"cloud-init-local.service",
"cloud-init.service",
"cpi.service",
"crond.service",
"ctrl-alt-del.target",

18
test/data/manifests/rhel_90-x86_64-qcow2-boot.json
View file

@ -3499,6 +3499,12 @@
{
"name": "org.osbuild.systemd",
"options": {
"enabled_services": [
"cloud-init.service",
"cloud-config.service",
"cloud-final.service",
"cloud-init-local.service"
],
"default_target": "multi-user.target"
}
},
@ -9707,8 +9713,8 @@
],
"hostname": "localhost.localdomain",
"image-format": {
"type": "qcow2",
"compat": "1.1"
"compat": "1.1",
"type": "qcow2"
},
"os-release": {
"ANSI_COLOR": "0;31",
@ -10282,10 +10288,6 @@
"services-disabled": [
"arp-ethers.service",
"chrony-wait.service",
"cloud-config.service",
"cloud-final.service",
"cloud-init-local.service",
"cloud-init.service",
"cockpit.socket",
"console-getty.service",
"cpupower.service",
@ -10335,6 +10337,10 @@
"auditd.service",
"autovt@.service",
"chronyd.service",
"cloud-config.service",
"cloud-final.service",
"cloud-init-local.service",
"cloud-init.service",
"crond.service",
"ctrl-alt-del.target",
"dbus-broker.service",