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

distro: enable cloud-init services for openstack and qcow2 images for fedora

Browse source 
Previously, cloud-init was installed on qcow and openstack images but was not
enabled, preventing a user from logging in to these images. Cloud-init, cloud-final,
cloud-init-local and cloud-config services are enabled to make cloud-init work
and to maintain consistency with official fedora 31 and fedora 32 images.

The image tests have been updated to reflect these changes.

Fixes #698
This commit is contained in:
chloenayon 2020-07-10 13:47:44 +02:00 • committed by Lars Karlitski
parent f38d55da88
commit ae3fb5e1c5
12 changed files with 148 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

12
internal/distro/fedora31/distro.go
View file

@ -242,6 +242,12 @@ func New() *Fedora31 {
"gobject-introspection",
"plymouth",
},
enabledServices: []string{
"cloud-init.service",
"cloud-config.service",
"cloud-final.service",
"cloud-init-local.service",
},
kernelOptions: "ro biosdevname=0 net.ifnames=0",
bootable: true,
defaultSize: 2 * GigaByte,
@ -269,6 +275,12 @@ func New() *Fedora31 {
excludedPackages: []string{
"dracut-config-rescue",
},
enabledServices: []string{
"cloud-init.service",
"cloud-config.service",
"cloud-final.service",
"cloud-init-local.service",
},
kernelOptions: "ro biosdevname=0 net.ifnames=0",
bootable: true,
defaultSize: 2 * GigaByte,

12
internal/distro/fedora32/distro.go
View file

@ -626,6 +626,12 @@ func New() distro.Distro {
"gobject-introspection",
"plymouth",
},
enabledServices: []string{
"cloud-init.service",
"cloud-config.service",
"cloud-final.service",
"cloud-init-local.service",
},
kernelOptions: "ro biosdevname=0 net.ifnames=0",
bootable: true,
defaultSize: 2 * GigaByte,
@ -653,6 +659,12 @@ func New() distro.Distro {
excludedPackages: []string{
"dracut-config-rescue",
},
enabledServices: []string{
"cloud-init.service",
"cloud-config.service",
"cloud-final.service",
"cloud-init-local.service",
},
kernelOptions: "ro biosdevname=0 net.ifnames=0",
bootable: true,
defaultSize: 2 * GigaByte,

13
test/cases/fedora_31-aarch64-openstack-boot.json
View file

@ -4128,6 +4128,17 @@
}
}
},
{
"name": "org.osbuild.systemd",
"options": {
"enabled_services": [
"cloud-init.service",
"cloud-config.service",
"cloud-final.service",
"cloud-init-local.service"
]
}
},
{
"name": "org.osbuild.selinux",
"options": {
@ -11639,4 +11650,4 @@
"unbound-anchor.timer"
]
}
}
}

13
test/cases/fedora_31-aarch64-qcow2-boot.json
View file

@ -4009,6 +4009,17 @@
}
}
},
{
"name": "org.osbuild.systemd",
"options": {
"enabled_services": [
"cloud-init.service",
"cloud-config.service",
"cloud-final.service",
"cloud-init-local.service"
]
}
},
{
"name": "org.osbuild.selinux",
"options": {
@ -11328,4 +11339,4 @@
"unbound-anchor.timer"
]
}
}
}

19
test/cases/fedora_31-x86_64-openstack-boot.json
View file

@ -4139,6 +4139,17 @@
"legacy": "i386-pc"
}
},
{
"name": "org.osbuild.systemd",
"options": {
"enabled_services": [
"cloud-init.service",
"cloud-config.service",
"cloud-final.service",
"cloud-init-local.service"
]
}
},
{
"name": "org.osbuild.selinux",
"options": {
@ -11688,10 +11699,6 @@
"arp-ethers.service",
"chrony-dnssrv@.timer",
"chrony-wait.service",
"cloud-config.service",
"cloud-final.service",
"cloud-init-local.service",
"cloud-init.service",
"console-getty.service",
"debug-shell.service",
"exit.target",
@ -11735,6 +11742,10 @@
"auditd.service",
"autovt@.service",
"chronyd.service",
"cloud-config.service",
"cloud-final.service",
"cloud-init-local.service",
"cloud-init.service",
"ctrl-alt-del.target",
"dbus-broker.service",
"dbus-org.fedoraproject.FirewallD1.service",

19
test/cases/fedora_31-x86_64-qcow2-boot.json
View file

@ -4069,6 +4069,17 @@
"legacy": "i386-pc"
}
},
{
"name": "org.osbuild.systemd",
"options": {
"enabled_services": [
"cloud-init.service",
"cloud-config.service",
"cloud-final.service",
"cloud-init-local.service"
]
}
},
{
"name": "org.osbuild.selinux",
"options": {
@ -11507,10 +11518,6 @@
"arp-ethers.service",
"chrony-dnssrv@.timer",
"chrony-wait.service",
"cloud-config.service",
"cloud-final.service",
"cloud-init-local.service",
"cloud-init.service",
"console-getty.service",
"debug-shell.service",
"exit.target",
@ -11553,6 +11560,10 @@
"auditd.service",
"autovt@.service",
"chronyd.service",
"cloud-config.service",
"cloud-final.service",
"cloud-init-local.service",
"cloud-init.service",
"ctrl-alt-del.target",
"dbus-broker.service",
"dbus-org.freedesktop.nm-dispatcher.service",

12
test/cases/fedora_31-x86_64-qcow2-customize.json
View file

@ -4172,6 +4172,10 @@
"name": "org.osbuild.systemd",
"options": {
"enabled_services": [
"cloud-init.service",
"cloud-config.service",
"cloud-final.service",
"cloud-init-local.service",
"sshd.socket"
],
"disabled_services": [
@ -11621,10 +11625,6 @@
"arp-ethers.service",
"chrony-dnssrv@.timer",
"chrony-wait.service",
"cloud-config.service",
"cloud-final.service",
"cloud-init-local.service",
"cloud-init.service",
"console-getty.service",
"debug-shell.service",
"exit.target",
@ -11666,6 +11666,10 @@
"auditd.service",
"autovt@.service",
"chronyd.service",
"cloud-config.service",
"cloud-final.service",
"cloud-init-local.service",
"cloud-init.service",
"ctrl-alt-del.target",
"dbus-broker.service",
"dbus-org.freedesktop.nm-dispatcher.service",

13
test/cases/fedora_32-aarch64-openstack-boot.json
View file

@ -3590,6 +3590,17 @@
}
}
},
{
"name": "org.osbuild.systemd",
"options": {
"enabled_services": [
"cloud-init.service",
"cloud-config.service",
"cloud-final.service",
"cloud-init-local.service"
]
}
},
{
"name": "org.osbuild.selinux",
"options": {
@ -10108,4 +10119,4 @@
"unbound-anchor.timer"
]
}
}
}

13
test/cases/fedora_32-aarch64-qcow2-boot.json
View file

@ -3380,6 +3380,17 @@
}
}
},
{
"name": "org.osbuild.systemd",
"options": {
"enabled_services": [
"cloud-init.service",
"cloud-config.service",
"cloud-final.service",
"cloud-init-local.service"
]
}
},
{
"name": "org.osbuild.selinux",
"options": {
@ -9565,4 +9576,4 @@
"unbound-anchor.timer"
]
}
}
}

19
test/cases/fedora_32-x86_64-openstack-boot.json
View file

@ -3557,6 +3557,17 @@
"legacy": "i386-pc"
}
},
{
"name": "org.osbuild.systemd",
"options": {
"enabled_services": [
"cloud-init.service",
"cloud-config.service",
"cloud-final.service",
"cloud-init-local.service"
]
}
},
{
"name": "org.osbuild.selinux",
"options": {
@ -9950,10 +9961,6 @@
"arp-ethers.service",
"chrony-dnssrv@.timer",
"chrony-wait.service",
"cloud-config.service",
"cloud-final.service",
"cloud-init-local.service",
"cloud-init.service",
"console-getty.service",
"debug-shell.service",
"exit.target",
@ -9996,6 +10003,10 @@
"auditd.service",
"autovt@.service",
"chronyd.service",
"cloud-config.service",
"cloud-final.service",
"cloud-init-local.service",
"cloud-init.service",
"ctrl-alt-del.target",
"dbus-broker.service",
"dbus-org.fedoraproject.FirewallD1.service",

19
test/cases/fedora_32-x86_64-qcow2-boot.json
View file

@ -3396,6 +3396,17 @@
"legacy": "i386-pc"
}
},
{
"name": "org.osbuild.systemd",
"options": {
"enabled_services": [
"cloud-init.service",
"cloud-config.service",
"cloud-final.service",
"cloud-init-local.service"
]
}
},
{
"name": "org.osbuild.selinux",
"options": {
@ -9535,10 +9546,6 @@
"arp-ethers.service",
"chrony-dnssrv@.timer",
"chrony-wait.service",
"cloud-config.service",
"cloud-final.service",
"cloud-init-local.service",
"cloud-init.service",
"console-getty.service",
"console-login-helper-messages-issuegen.service",
"console-login-helper-messages-motdgen.service",
@ -9582,6 +9589,10 @@
"auditd.service",
"autovt@.service",
"chronyd.service",
"cloud-config.service",
"cloud-final.service",
"cloud-init-local.service",
"cloud-init.service",
"ctrl-alt-del.target",
"dbus-broker.service",
"dbus-org.freedesktop.nm-dispatcher.service",

12
test/cases/fedora_32-x86_64-qcow2-customize.json
View file

@ -3499,6 +3499,10 @@
"name": "org.osbuild.systemd",
"options": {
"enabled_services": [
"cloud-init.service",
"cloud-config.service",
"cloud-final.service",
"cloud-init-local.service",
"sshd.socket"
],
"disabled_services": [
@ -9649,10 +9653,6 @@
"arp-ethers.service",
"chrony-dnssrv@.timer",
"chrony-wait.service",
"cloud-config.service",
"cloud-final.service",
"cloud-init-local.service",
"cloud-init.service",
"console-getty.service",
"console-login-helper-messages-issuegen.service",
"console-login-helper-messages-motdgen.service",
@ -9695,6 +9695,10 @@
"auditd.service",
"autovt@.service",
"chronyd.service",
"cloud-config.service",
"cloud-final.service",
"cloud-init-local.service",
"cloud-init.service",
"ctrl-alt-del.target",
"dbus-broker.service",
"dbus-org.freedesktop.nm-dispatcher.service",