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

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

Merged

Conversation

thomasdesr
Copy link
Contributor

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.

@thomasdesr thomasdesr force-pushed the salt-ssh-flat-roster-range-filter branch 3 times, most recently from 7caefed to a278efe Compare November 24, 2015 01:41
@thomasdesr thomasdesr force-pushed the salt-ssh-flat-roster-range-filter branch from a278efe to e010f2d Compare November 24, 2015 01:42
@cachedout
Copy link
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!

@cachedout cachedout added the pending-changes The pull request needs additional changes before it can be merged label Nov 24, 2015
@thomasdesr thomasdesr force-pushed the salt-ssh-flat-roster-range-filter branch from 5b9c532 to 18f5103 Compare November 24, 2015 22:29
@jfindlay jfindlay added Core relates to code central or existential to Salt Salt-SSH labels Nov 24, 2015
@thomasdesr
Copy link
Contributor Author

@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

salt-ssh --roster range '%%%example.range.cluster' test.ping

'''

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add from __future__ import absolute_import

@cachedout
Copy link
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!

@thomasdesr thomasdesr force-pushed the salt-ssh-flat-roster-range-filter branch from 18f5103 to 56b3302 Compare November 25, 2015 18:35
@thomasdesr
Copy link
Contributor Author

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

@cachedout
Copy link
Contributor

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

cachedout pushed a commit that referenced this pull request Nov 30, 2015
…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
cachedout pushed a commit to cachedout/salt that referenced this pull request Nov 30, 2015
cro pushed a commit to cro/salt that referenced this pull request Dec 1, 2015
cro pushed a commit to cro/salt that referenced this pull request Dec 1, 2015
@thomasdesr
Copy link
Contributor Author

@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
Labels
Core relates to code central or existential to Salt pending-changes The pull request needs additional changes before it can be merged Salt-SSH
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants