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

Don't require 'domain' to be present before checking fqdn_ip* grains #34284

Merged
merged 1 commit into from
Jun 27, 2016

Conversation

rallytime
Copy link
Contributor

What does this PR do?

Fixes a regression found in #34129 where fqdn_ip4 or fqdn_ip6 grains were empty if the domain grain wasn't set. This removes the check to require the domain name before running the appropriate socket.getaddrinfo calls on the fqdn grain value.

What issues does this PR fix or reference?

Fixes #34129

Previous Behavior

# salt-call grains.item fqdn_ip4
local:
    ----------
    fqdn_ip4:

New Behavior

# salt-call grains.item fqdn_ip4 
local:
    ----------
    fqdn_ip4:
        - 172.16.236.1

Tests written?

No

Please review Salt's Contributing Guide for best practices.

@cachedout
Copy link
Contributor

FYI: Partial revert of #29346

@cachedout cachedout merged commit dc84624 into saltstack:2016.3 Jun 27, 2016
@rallytime rallytime deleted the fix-34129 branch June 27, 2016 17:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants