From cb4560bd404da95c4370da73b498f54b7f4a070c Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Tue, 8 Feb 2022 10:36:59 +0100 Subject: [PATCH] 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 --- coreos-base/oem-azure/files/base/default.ign | 14 ------------ .../oem-digitalocean/files/base/default.ign | 14 ------------ .../oem-ec2-compat/files/base/default.ign | 22 ------------------- .../oem-ec2-compat-0.1.2-r2.ebuild | 1 - coreos-base/oem-gce/files/base/default.ign | 14 ------------ coreos-base/oem-packet/files/base/default.ign | 14 ------------ coreos-base/oem-vmware/files/base/default.ign | 14 ------------ 7 files changed, 93 deletions(-) delete mode 100644 coreos-base/oem-azure/files/base/default.ign delete mode 100644 coreos-base/oem-digitalocean/files/base/default.ign delete mode 100644 coreos-base/oem-ec2-compat/files/base/default.ign delete mode 100644 coreos-base/oem-gce/files/base/default.ign delete mode 100644 coreos-base/oem-packet/files/base/default.ign delete mode 100644 coreos-base/oem-vmware/files/base/default.ign diff --git a/coreos-base/oem-azure/files/base/default.ign b/coreos-base/oem-azure/files/base/default.ign deleted file mode 100644 index 29b7c91e598..00000000000 --- a/coreos-base/oem-azure/files/base/default.ign +++ /dev/null @@ -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" - } - ] - } -} diff --git a/coreos-base/oem-digitalocean/files/base/default.ign b/coreos-base/oem-digitalocean/files/base/default.ign deleted file mode 100644 index 58589c2d2ad..00000000000 --- a/coreos-base/oem-digitalocean/files/base/default.ign +++ /dev/null @@ -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" - } - ] - } -} diff --git a/coreos-base/oem-ec2-compat/files/base/default.ign b/coreos-base/oem-ec2-compat/files/base/default.ign deleted file mode 100644 index ed427e8a5b0..00000000000 --- a/coreos-base/oem-ec2-compat/files/base/default.ign +++ /dev/null @@ -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" - } - ] - } -} diff --git a/coreos-base/oem-ec2-compat/oem-ec2-compat-0.1.2-r2.ebuild b/coreos-base/oem-ec2-compat/oem-ec2-compat-0.1.2-r2.ebuild index 3978697142f..96a8bf8faba 100644 --- a/coreos-base/oem-ec2-compat/oem-ec2-compat-0.1.2-r2.ebuild +++ b/coreos-base/oem-ec2-compat/oem-ec2-compat-0.1.2-r2.ebuild @@ -60,7 +60,6 @@ src_install() { insinto "/usr/share/oem/base" doins "${FILESDIR}/base/README" - doins "${FILESDIR}/base/default.ign" if use ec2 ; then newins "${FILESDIR}/base/base-ec2.ign" base.ign fi diff --git a/coreos-base/oem-gce/files/base/default.ign b/coreos-base/oem-gce/files/base/default.ign deleted file mode 100644 index 28bf972ad53..00000000000 --- a/coreos-base/oem-gce/files/base/default.ign +++ /dev/null @@ -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" - } - ] - } -} diff --git a/coreos-base/oem-packet/files/base/default.ign b/coreos-base/oem-packet/files/base/default.ign deleted file mode 100644 index 8d976559353..00000000000 --- a/coreos-base/oem-packet/files/base/default.ign +++ /dev/null @@ -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" - } - ] - } -} diff --git a/coreos-base/oem-vmware/files/base/default.ign b/coreos-base/oem-vmware/files/base/default.ign deleted file mode 100644 index 48290825103..00000000000 --- a/coreos-base/oem-vmware/files/base/default.ign +++ /dev/null @@ -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" - } - ] - } -}