coreos-base/oem: remove default.ign

With ignitionv3, there is no more `default.ign` loaded configuration. We
can safely remove this configuration since it won't be loaded anyway.

oem-cloudinit will be conditionally enabled based on `ignition`
execution result.

Signed-off-by: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
This commit is contained in:
Mathieu Tortuyaux 2022-02-08 10:36:59 +01:00
parent 05d1141214
commit 4f9b1e9e5a
7 changed files with 0 additions and 93 deletions

View File

@ -1,14 +0,0 @@
{
"ignition": {
"version": "2.1.0"
},
"systemd": {
"units": [
{
"name": "oem-cloudinit.service",
"enabled": true,
"contents": "[Unit]\nDescription=Cloudinit from Azure metadata\n\n[Service]\nType=oneshot\nExecStart=/usr/bin/coreos-cloudinit --oem=azure\n\n[Install]\nWantedBy=multi-user.target\n"
}
]
}
}

View File

@ -1,14 +0,0 @@
{
"ignition": {
"version": "2.1.0"
},
"systemd": {
"units": [
{
"name": "oem-cloudinit.service",
"enabled": true,
"contents": "[Unit]\nDescription=Cloudinit from DigitalOcean metadata\n\n[Service]\nType=oneshot\nExecStart=/usr/bin/coreos-cloudinit --oem=digitalocean\n\n[Install]\nWantedBy=multi-user.target\n"
}
]
}
}

View File

@ -1,22 +0,0 @@
{
"ignition": {
"version": "2.1.0"
},
"systemd": {
"units": [
{
"name": "user-configdrive.service",
"mask": true
},
{
"name": "user-configvirtfs.service",
"mask": true
},
{
"name": "oem-cloudinit.service",
"enabled": true,
"contents": "[Unit]\nDescription=Cloudinit from platform metadata\n\n[Service]\nType=oneshot\nExecStart=/usr/bin/coreos-cloudinit --oem=ec2-compat\n\n[Install]\nWantedBy=multi-user.target\n"
}
]
}
}

View File

@ -60,7 +60,6 @@ src_install() {
insinto "/usr/share/oem/base" insinto "/usr/share/oem/base"
doins "${FILESDIR}/base/README" doins "${FILESDIR}/base/README"
doins "${FILESDIR}/base/default.ign"
if use ec2 ; then if use ec2 ; then
newins "${FILESDIR}/base/base-ec2.ign" base.ign newins "${FILESDIR}/base/base-ec2.ign" base.ign
fi fi

View File

@ -1,14 +0,0 @@
{
"ignition": {
"version": "2.1.0"
},
"systemd": {
"units": [
{
"name": "oem-cloudinit.service",
"enabled": true,
"contents": "[Unit]\nDescription=Cloudinit from GCE metadata\n\n[Service]\nType=oneshot\nExecStart=/usr/bin/coreos-cloudinit --oem=gce\n\n[Install]\nWantedBy=multi-user.target\n"
}
]
}
}

View File

@ -1,14 +0,0 @@
{
"ignition": {
"version": "2.1.0"
},
"systemd": {
"units": [
{
"name": "oem-cloudinit.service",
"enabled": true,
"contents": "[Unit]\nDescription=Cloudinit from Packet metadata\n\n[Service]\nType=oneshot\nExecStart=/usr/bin/coreos-cloudinit --oem=packet\n\n[Install]\nWantedBy=multi-user.target\n"
}
]
}
}

View File

@ -1,14 +0,0 @@
{
"ignition": {
"version": "2.1.0"
},
"systemd": {
"units": [
{
"name": "oem-cloudinit.service",
"enabled": true,
"contents": "[Unit]\nDescription=Cloudinit from VMware metadata\n\n[Service]\nType=oneshot\nExecStart=/usr/bin/coreos-cloudinit --oem=vmware\n\n[Install]\nWantedBy=multi-user.target\n"
}
]
}
}