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

[2018.3] Fixes to dns_check in salt.utils.network #51297

Conversation

garethgreenaway
Copy link
Contributor

What does this PR do?

Inside the dns_check function if the master address is either an salt.ext.ipaddress.IPv4Address or an salt.ext.ipaddress.IPv6Address object, just return the exploded IP address.

What issues does this PR fix or reference?

#51289

Previous Behavior

Specifying an IP address as the Salt master would result in the Salt minion being unable to start.

New Behavior

Salt minion starts.

Tests written?

Yes

Commits signed with GPG?

Yes/No

Please review Salt's Contributing Guide for best practices.

See GitHub's page on GPG signing for more information about signing commits with GPG.

….ext.ipaddress.IPv4Address or an salt.ext.ipaddress.IPv6Address object, just return the exploded IP address.
@Ch3LL Ch3LL added bugfix-bckport will be be back-ported to an older release branch by creating a PR against that branch v2018.3.4 unsupported version labels Jan 23, 2019
Copy link
Collaborator

@s0undt3ch s0undt3ch left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A change went in into 2018.3 which no longer keeps ipaddress instances, they're back to strings.

#51274

@garethgreenaway
Copy link
Contributor Author

@s0undt3ch I was still seeing the issue even after pulling in the changes from that PR you referenced.

@s0undt3ch
Copy link
Collaborator

Really?! Weird.

So this should still be considered being merged right?

@garethgreenaway
Copy link
Contributor Author

@s0undt3ch Let me double it again.

@garethgreenaway
Copy link
Contributor Author

@s0undt3ch It looks like is working as expected now, I think the dns_check test is valuable though so I'll update the PR to just include the test.

@s0undt3ch
Copy link
Collaborator

👍

@Ch3LL Ch3LL removed the bugfix-bckport will be be back-ported to an older release branch by creating a PR against that branch label Jan 25, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
v2018.3.4 unsupported version
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants