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

Allow file_map in salt-cloud to handle folders. #23346

Merged
merged 3 commits into from
May 6, 2015

Conversation

ericfode
Copy link

@ericfode ericfode commented May 4, 2015

Logic has been added to sftp_file and the file_map decoder for salt-cloud allowing you to list folders as well as files in file_map.

The use case was seeding the /srv directory and /etc/salt directory on a salt master that is isolated.

@rallytime
Copy link
Contributor

Thanks @ericfode! Mind grabbing the pylint errors here? https://jenkins.saltstack.com/job/salt-pr-lint-n/5012/violations/

Also, does this fix a bug in an earlier release branch such as 2014.7 or 2015.2? I am wondering if you think this fix should be applied there. We can backport it easily.

@ericfode
Copy link
Author

ericfode commented May 4, 2015

I think it should be backported if possible. Thanks for the quick response! (also fixed the linting).

@rallytime rallytime added the bugfix-bckport will be be back-ported to an older release branch by creating a PR against that branch label May 5, 2015
@rallytime
Copy link
Contributor

Sure! For future fixes, please feel free to submit the fix directly to the "oldest release branch" that the fix applies to. We merge branches forward, so it's easy to make sure the fix applies to all relevant branches. There's some more info about that [here].(http://docs.saltstack.com/en/latest/topics/development/contributing.html#which-salt-branch)

Don't worry about this one, though. I will be happy to backport it. Thanks again for the fix!

@ericfode
Copy link
Author

ericfode commented May 5, 2015

@rallytime Thank you so much! you guys are a pleasure to work with.

@techhat
Copy link
Contributor

techhat commented May 5, 2015

@ericfode, +1 on this!

@rallytime rallytime added ZZZ[Done]-back-ported-bf RETIRED The pull request has been back-ported to an older branch. and removed bugfix-bckport will be be back-ported to an older release branch by creating a PR against that branch labels May 5, 2015
@rallytime
Copy link
Contributor

@ericfode No problem! Thanks again for this excellent fix!

techhat added a commit that referenced this pull request May 6, 2015
Allow file_map in salt-cloud to handle folders.
@techhat techhat merged commit 1f1785b into saltstack:develop May 6, 2015
jfindlay added a commit that referenced this pull request May 6, 2015
@nmadhok
Copy link
Contributor

nmadhok commented May 7, 2015

@ericfode +1

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Tests-Passed ZZZ[Done]-back-ported-bf RETIRED The pull request has been back-ported to an older branch.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants