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

Port #49097 to master #56802

Merged
merged 4 commits into from Apr 22, 2020
Merged

Port #49097 to master #56802

merged 4 commits into from Apr 22, 2020

Conversation

techhat
Copy link
Contributor

@techhat techhat commented Apr 21, 2020

Port #49097 to master

This makes it possible for the master to be in a different region
than the minion and still fetch ec2 pillars. This requires the
use_grain configuration to be set to True and will fall back to the
master's region if there is no region grain.

Credit to John Nielsen for the code.

Signed-off-by: Carson Anderson <ca@carsonoid.net>
@techhat techhat requested a review from a team as a code owner April 21, 2020 20:01
@ghost ghost requested review from cmcmarrow and removed request for a team April 21, 2020 20:01
@waynew waynew added this to PR needs merge to master in PRs to port to master via automation Apr 21, 2020
@dwoz dwoz merged commit 12040d8 into saltstack:master Apr 22, 2020
PRs to port to master automation moved this from PR needs merge to master to PR merged Apr 22, 2020
@sagetherage sagetherage added the ZRelease-Sodium retired label label May 18, 2020
@sagetherage sagetherage added this to Done in Sodium May 20, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
Sodium
  
Done
Development

Successfully merging this pull request may close these issues.

None yet

4 participants