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

[salt-ssh] Add a range roster and range targeting options for the flat roster #29139

Merged
merged 3 commits into from Nov 30, 2015

Conversation

Projects
None yet
3 participants
@thomaso-mirodin
Contributor

thomaso-mirodin commented Nov 24, 2015

This PR has two changes in it (let me know if you want them split):

  • Add support for targeting using a range query to the flat roster system
  • Add a roster that uses range data as its backend. The major caveat here is that it currently has no additional support for any other targeting methods :S. However I think most folks who use range tend to use it as their central metadata store so this should get them the basic level of support they need.
@cachedout

This comment has been minimized.

Show comment
Hide comment
@cachedout

cachedout Nov 24, 2015

Contributor

@thomaso-mirodin Nice! This will be very useful.

There are a couple of minor lint errors here. Would you mind taking a look and fixing them before we get this merged? Thanks!

Contributor

cachedout commented Nov 24, 2015

@thomaso-mirodin Nice! This will be very useful.

There are a couple of minor lint errors here. Would you mind taking a look and fixing them before we get this merged? Thanks!

thomaso-mirodin added a commit to thomaso-mirodin/salt that referenced this pull request Nov 24, 2015

thomaso-mirodin added a commit to thomaso-mirodin/salt that referenced this pull request Nov 24, 2015

@thomaso-mirodin

This comment has been minimized.

Show comment
Hide comment
@thomaso-mirodin

thomaso-mirodin Nov 25, 2015

Contributor

@cachedout I don't really know what to make of the last linting error, it seems to be concerned about a blank line being a 3.x incompatability XD

Contributor

thomaso-mirodin commented Nov 25, 2015

@cachedout I don't really know what to make of the last linting error, it seems to be concerned about a blank line being a 3.x incompatability XD

Show outdated Hide outdated salt/roster/range.py Outdated
@cachedout

This comment has been minimized.

Show comment
Hide comment
@cachedout

cachedout Nov 25, 2015

Contributor

@thomaso-mirodin Yeah, that's a bug in the way the linter displays its output in Jenkins. Sorry about that. I've commented in-line with the line that needs to be added to satisfy the linter. Thanks!

Contributor

cachedout commented Nov 25, 2015

@thomaso-mirodin Yeah, that's a bug in the way the linter displays its output in Jenkins. Sorry about that. I've commented in-line with the line that needs to be added to satisfy the linter. Thanks!

@thomaso-mirodin

This comment has been minimized.

Show comment
Hide comment
@thomaso-mirodin

thomaso-mirodin Nov 27, 2015

Contributor

@cachedout Looks like the the last failures are unrelated to salt-ssh, see anything else you'd like me to change? :D

Contributor

thomaso-mirodin commented Nov 27, 2015

@cachedout Looks like the the last failures are unrelated to salt-ssh, see anything else you'd like me to change? :D

@cachedout

This comment has been minimized.

Show comment
Hide comment
@cachedout

cachedout Nov 30, 2015

Contributor

@thomaso-mirodin I think we have everything we need. I'm going to go ahead and merge this. Thanks!

Contributor

cachedout commented Nov 30, 2015

@thomaso-mirodin I think we have everything we need. I'm going to go ahead and merge this. Thanks!

cachedout added a commit that referenced this pull request Nov 30, 2015

Merge pull request #29139 from thomaso-mirodin/salt-ssh-flat-roster-r…
…ange-filter

[salt-ssh] Add a range roster and range targeting options for the flat roster

@cachedout cachedout merged commit 3aa84b6 into saltstack:2015.8 Nov 30, 2015

4 of 6 checks passed

default Merged build finished.
Details
jenkins/salt-pr-rs-cent6-n Salt PR - RS CentOS 6 #224 — FAILURE
Details
jenkins/salt-pr-clone Salt PR - Clone Repository #11512 — SUCCESS
Details
jenkins/salt-pr-linode-ubuntu14.04-n Salt PR - Linode Ubuntu 14.04 #2579 — SUCCESS
Details
jenkins/salt-pr-lint-n Salt PR - Code Lint #11220 — SUCCESS
Details
jenkins/salt-pr-rs-cent7-n Salt PR - RS CentOS 7 #10049 — SUCCESS
Details

cachedout added a commit to cachedout/salt that referenced this pull request Nov 30, 2015

cro added a commit to cro/salt that referenced this pull request Dec 1, 2015

cro added a commit to cro/salt that referenced this pull request Dec 1, 2015

@thomaso-mirodin

This comment has been minimized.

Show comment
Hide comment
@thomaso-mirodin

thomaso-mirodin Dec 2, 2015

Contributor

@cachedout Hey! :D

Why the switch to using format on the log messages? That causes the cost of having to format strings to be paid regardless of if that logging level is enabled or not.

https://docs.python.org/2/library/logging.html#logging.Logger.debug

Contributor

thomaso-mirodin commented Dec 2, 2015

@cachedout Hey! :D

Why the switch to using format on the log messages? That causes the cost of having to format strings to be paid regardless of if that logging level is enabled or not.

https://docs.python.org/2/library/logging.html#logging.Logger.debug

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment