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

Import vsphere only on esxi hosts #57579

Merged
merged 4 commits into from
Jun 9, 2020
Merged

Import vsphere only on esxi hosts #57579

merged 4 commits into from
Jun 9, 2020

Conversation

marbx
Copy link
Contributor

@marbx marbx commented Jun 7, 2020

What does this PR do?

import vsphere only on esxi hosts.

What issues does this PR fix?

#57529

Current Behavior

The esxi grains attempt to load vsphere before testing if the minion is an esxi hosts.
On Windows, this attempt wastes 3/4 of a test.ping command (13 of 16 profiled seconds) by busy polling (100%CPU).

Merge requirements satisfied?

  • No docs
  • Changelog
  • Tests exist

@marbx marbx requested a review from a team as a code owner June 7, 2020 15:37
@ghost ghost requested review from dwoz and removed request for a team June 7, 2020 15:37
twangboy
twangboy previously approved these changes Jun 8, 2020
@twangboy twangboy added v3001.1 vulnerable version Merge Ready ZRelease-Sodium retired label and removed v3001.1 vulnerable version labels Jun 8, 2020
changelog/57529.fixed Outdated Show resolved Hide resolved
@bryceml bryceml requested a review from twangboy June 8, 2020 18:10
@twangboy twangboy requested a review from bryceml June 8, 2020 19:47
@twangboy
Copy link
Contributor

twangboy commented Jun 8, 2020

@bryceml I read that like 10 times and couldn't see it...

@dwoz dwoz merged commit 39e7406 into saltstack:master Jun 9, 2020
@mirceaulinic
Copy link
Contributor

FYI this caused a bug in Salt 3001, see #57811.

@marbx marbx deleted the NO_VSPHERE_WITHOUT_ESXI branch July 22, 2020 20:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ZRelease-Sodium retired label
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants