Skip to content

Drop GCE disk rules and drop Rackspace + EM support #140

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chewi merged 3 commits into from
May 15, 2026
Merged

Drop GCE disk rules and drop Rackspace + EM support #140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6f8340e
udev: Drop GCE disk rules
chewi Dec 29, 2025
c7b15df
Drop support for Equinix Metal (Packet)
chewi Apr 30, 2026
8298b4b
Drop support for Rackspace
chewi Apr 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion systemd/system/multi-user.target.wants/packet-phone-home.service
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion systemd/system/oem-cloudinit.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Description=Run cloudinit
[Service]
EnvironmentFile=/var/run/ignition.env
Type=oneshot
ExecCondition=/usr/bin/bash -xc 'OEMS=(aws gcp rackspace-onmetal azure cloudsigma packet vmware digitalocean openstack); echo $${OEMS[*]} | tr " " "\n" | grep -q -x -F "${OEM_ID}"'
ExecCondition=/usr/bin/bash -xc 'OEMS=(aws gcp azure cloudsigma vmware digitalocean openstack); echo $${OEMS[*]} | tr " " "\n" | grep -q -x -F "${OEM_ID}"'
ExecStart=/usr/bin/bash -xc '/usr/bin/coreos-cloudinit --oem="$(if [ "${OEM_ID}" = aws -o "${OEM_ID}" = openstack ]; then echo ec2-compat; elif [ "${OEM_ID}" = gcp ]; then echo gce; else echo "${OEM_ID}" ; fi)"'

[Install]
Expand Down
20 changes: 0 additions & 20 deletions systemd/system/packet-phone-home.service
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions systemd/system/sshkeys.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,6 @@ After=update-ssh-keys-after-ignition.service

ConditionPathIsSymbolicLink=!/etc/systemd/system/coreos-metadata-sshkeys@core.service

ConditionKernelCommandLine=|ignition.platform.id=packet
ConditionKernelCommandLine=|flatcar.oem.id=packet
ConditionKernelCommandLine=|coreos.oem.id=packet

ConditionKernelCommandLine=|ignition.platform.id=ec2
ConditionKernelCommandLine=|flatcar.oem.id=ec2
ConditionKernelCommandLine=|coreos.oem.id=ec2
Expand Down
10 changes: 0 additions & 10 deletions tests/coreos-install/positive/general.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,16 +79,6 @@ hostname: "coreos1"`),
Func: baseTest,
OEM: util.StringToPtr("digitalocean"),
})
register.Register(register.Test{
Name: "OEM - packet",
Func: baseTest,
OEM: util.StringToPtr("packet"),
})
register.Register(register.Test{
Name: "OEM - rackspace",
Func: baseTest,
OEM: util.StringToPtr("rackspace"),
})
register.Register(register.Test{
Name: "OEM - vmware_raw",
Func: baseTest,
Expand Down
7 changes: 1 addition & 6 deletions udev/rules.d/90-cloud-storage.rules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,6 @@
ACTION=="remove", GOTO="cloud_storage_end"
SUBSYSTEM!="block", GOTO="cloud_storage_end"

# Google GCE by-id
KERNEL=="sd*|vd*", ENV{ID_VENDOR}=="Google", ENV{ID_MODEL}=="PersistentDisk", ENV{ID_SERIAL_SHORT}=="?*", ENV{DEVTYPE}=="disk", SYMLINK+="disk/by-id/google-$env{ID_SERIAL_SHORT}"
KERNEL=="sd*|vd*", ENV{ID_VENDOR}=="Google", ENV{ID_MODEL}=="PersistentDisk", ENV{ID_SERIAL_SHORT}=="?*", ENV{DEVTYPE}=="partition", SYMLINK+="disk/by-id/google-$env{ID_SERIAL_SHORT}-part%n"
KERNEL=="sd*|vd*", ENV{ID_VENDOR}=="Google", ENV{ID_MODEL}=="EphemeralDisk", ENV{ID_SERIAL_SHORT}=="?*", ENV{DEVTYPE}=="disk", SYMLINK+="disk/by-id/google-$env{ID_SERIAL_SHORT}"
KERNEL=="sd*|vd*", ENV{ID_VENDOR}=="Google", ENV{ID_MODEL}=="EphemeralDisk", ENV{ID_SERIAL_SHORT}=="?*", ENV{DEVTYPE}=="partition", SYMLINK+="disk/by-id/google-$env{ID_SERIAL_SHORT}-part%n"

## AWS EBS NVMe names
## https://github.com/coreos/bugs/issues/2399
# NVMe devices
Expand All @@ -19,6 +13,7 @@ KERNEL=="nvme[0-9]*n[0-9]*p[0-9]*", ENV{DEVTYPE}=="partition", ATTRS{model}=="Am
KERNEL=="nvme[0-9]*n[0-9]*p[0-9]*", ENV{DEVTYPE}=="partition", ATTRS{model}=="Amazon Elastic Block Store", ATTRS{serial}=="?*", ENV{_NS_ID}=="?*", SYMLINK+="disk/by-id/nvme-$attr{model}_$attr{serial}-ns-$env{_NS_ID}-part%n", OPTIONS+="string_escape=replace"
KERNEL=="nvme[0-9]*n[0-9]*p[0-9]*", ENV{DEVTYPE}=="partition", ATTRS{model}=="Amazon Elastic Block Store", ATTRS{serial}=="?*", ENV{_NS_ID}=="?*", PROGRAM="cloud_aws_ebs_nvme_id -d /dev/%k", SYMLINK+="%c%n"

# GCE is handled in the app-admin/google-guest-configs package.
# TODO: Anyone else support friendly names?

LABEL="cloud_storage_end"