Skip to content
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.

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

Fix virtual resolution on Illumos LX #2772

Merged
merged 1 commit into from
Nov 1, 2024

Conversation

smokris
Copy link
Contributor

@smokris smokris commented Oct 20, 2024

On an Illumos LX zone, prior to 7bc38cc:

# facter virtual
illumos-lx

After 7bc38cc:

# facter virtual
[2024-10-20 18:26:01.740952 ] WARN Facter::Resolvers::Containers - Container runtime, 'zone', is unsupported, setting to, 'container_other'
container_other

The problem is that Facter::Resolvers::Containers now returns a value, causing Facter::Util::Facts::Posix::VirtualDetector#platform to return that value instead of executing #check_illumos_lx.

This PR fixes that, and adds a test.

With this PR:

# facter virtual
illumos-lx

@smokris smokris requested a review from a team as a code owner October 20, 2024 23:13
@puppetlabs-jenkins
Copy link
Collaborator

Can one of the admins verify this patch?

@mhashizume mhashizume added the bug Something isn't working label Oct 21, 2024
@mhashizume
Copy link
Contributor

Thank you for this PR @smokris , I have added it to our internal backlog for us to look at and triage.

@mhashizume
Copy link
Contributor

Could you rebase to pull in the changes from #2775 ? Thanks!

@smokris smokris force-pushed the container-illumos-lx-zone branch from a9b13e9 to b220868 Compare November 1, 2024 18:26
@smokris
Copy link
Contributor Author

smokris commented Nov 1, 2024

Could you rebase to pull in the changes from #2775 ? Thanks!

Sure, I rebased it just now.

@mhashizume
Copy link
Contributor

mhashizume commented Nov 1, 2024

Ah sorry, one more rebase for the changes in #2776 to fix that unrelated Rubocop error

…er::Util::Facts::Posix::VirtualDetector#check_illumos_lx is executed
@smokris smokris force-pushed the container-illumos-lx-zone branch from b220868 to 31d32da Compare November 1, 2024 18:38
@smokris
Copy link
Contributor Author

smokris commented Nov 1, 2024

No problem; I rebased it again.

@mhashizume mhashizume merged commit e0f379e into puppetlabs:main Nov 1, 2024
19 checks passed
@mhashizume
Copy link
Contributor

Thanks again @smokris !

@smokris smokris deleted the container-illumos-lx-zone branch November 14, 2024 02:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants