Remove afterburn /etc/hostname setup for EC2 and align it with upstream#43
Merged
pothos merged 1 commit intoflatcar-masterfrom Apr 14, 2022
Merged
Remove afterburn /etc/hostname setup for EC2 and align it with upstream#43pothos merged 1 commit intoflatcar-masterfrom
pothos merged 1 commit intoflatcar-masterfrom
Conversation
9cce79b to
7948d65
Compare
The hostname afterburn got from the EC2 metadata was a FQDN and too long. We actually don't need afterburn to set the hostname because it is also set up via DHCP. Also, the upstream afterburn-hostname.service already has conditions to run on the right platforms. We can use these instead of custom shell logic. Align flatcar-metadata-hostname.service with upstream afterburn and don't use it for EC2. Adapt the upstream unit to fit our needs with a different cmdline arg naming and skip the relabling workaround (for now). Fixes flatcar/Flatcar#707
7948d65 to
8743adb
Compare
pothos
added a commit
to flatcar-archive/coreos-overlay
that referenced
this pull request
Apr 13, 2022
This pulls in flatcar/bootengine#43 to remove the afterburn /etc/hostname setup for EC2 and align the afterburn /etc/hostname setup with upstream.
1 task
pothos
added a commit
to flatcar-archive/coreos-overlay
that referenced
this pull request
Apr 13, 2022
This pulls in flatcar/bootengine#43 to remove the afterburn /etc/hostname setup for EC2 and align the afterburn /etc/hostname setup with upstream.
krnowak
approved these changes
Apr 14, 2022
Member
krnowak
left a comment
There was a problem hiding this comment.
One question, but otherwise looks good.
Comment on lines
+31
to
+32
| ConditionKernelCommandLine=|coreos.oem.id=packet | ||
| ConditionKernelCommandLine=|flatcar.oem.id=packet |
Member
There was a problem hiding this comment.
Do we have a supported ID for packet using the new name (equinix metal)?
Member
Author
There was a problem hiding this comment.
Not yet, both coreos-base/oem-packet/files/grub.cfg and coreos-base/oem-packet/files/oem-release use packet
pothos
added a commit
to flatcar-archive/coreos-overlay
that referenced
this pull request
Apr 14, 2022
This pulls in flatcar/bootengine#43 to remove the afterburn /etc/hostname setup for EC2 and align the afterburn /etc/hostname setup with upstream.
pothos
added a commit
to flatcar-archive/coreos-overlay
that referenced
this pull request
Apr 14, 2022
This pulls in flatcar/bootengine#43 to remove the afterburn /etc/hostname setup for EC2 and align the afterburn /etc/hostname setup with upstream.
pothos
added a commit
to flatcar-archive/coreos-overlay
that referenced
this pull request
Apr 14, 2022
This pulls in flatcar/bootengine#43 to remove the afterburn /etc/hostname setup for EC2 and align the afterburn /etc/hostname setup with upstream.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The hostname afterburn got from the EC2 metadata was a FQDN and too
long. We actually don't need afterburn to set the hostname because it
is also set up via DHCP. Also, the upstream afterburn-hostname.service
already has conditions to run on the right platforms. We can use these
instead of custom shell logic.
Align flatcar-metadata-hostname.service with upstream afterburn and
don't use it for EC2. Adapt the upstream unit to fit our needs with a
different cmdline arg naming and skip the relabling workaround
(for now).
Fixes flatcar/Flatcar#707
How to use
Testing done
Test results in flatcar-archive/coreos-overlay#1817
changelog/directory (user-facing change, bug fix, security fix, update)↑ TODO in c-o