fix: persist /etc/nvme (backport #984) #985
Merged
Conversation
This file contains 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
![mergify[bot]](https://avatars.githubusercontent.com/in/10562?s=60&v=4){kind=small}
Without this, the contents of `/etc/nvme` won't be persistent, as our config here overrides that in os2. This is needed in support of harvester/os2#190 Related issue: harvester/harvester#6911 Signed-off-by: Tim Serong <tserong@suse.com> (cherry picked from commit 8214c46)
Vicente-Cheng
approved these changes
Feb 18, 2025
ibrokethecloud
approved these changes
Feb 18, 2025
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.
Problem:
Our OS image includes
/etc/machine-id,/etc/iscsi/initiatorname.iscsi,/etc/nvme/hostidand/etc/nvme/hostnqn. This means that those files will be identical on every single Harvester node installed from a given ISO image. This is wrong./etc/machine-idis meant to be unique per host, see e.g.:https://manpages.opensuse.org/Tumbleweed/systemd/machine-id.5.en.html
Likewise, the iSCSI initiator name and NVMe hostid/hostnqn need to be unique when accessing external storage via iSCSI or NVMe over fabrics.
Solution:
harvester/os2#190 ensures that those files are not included in our OS image, and will be instead generated on first boot. This harvester-installer PR is also required to ensure
/etc/nvmepersists correctly.Related Issue:
harvester/harvester#6911
Test plan:
/etc/machine-id,/etc/iscsi/initiatorname.iscsi,/etc/nvme/hostidand/etc/nvme/hostnqon each node. The contents of the files should be different on each node. This verifies that those files are being uniquely generated on each node on first boot.This is an automatic backport of pull request #984 done by [Mergify](https://mergify.com).