Skip to content

Port #49097 to master#56802

Merged
dwoz merged 4 commits intosaltstack:masterfrom
techhat:master-port-49097
Apr 22, 2020
Merged

Port #49097 to master#56802
dwoz merged 4 commits intosaltstack:masterfrom
techhat:master-port-49097

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
@dwoz dwoz merged commit 12040d8 into saltstack:master Apr 22, 2020
@sagetherage sagetherage added the ZRelease-Sodium retired label label May 18, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants