Support match-sets in iptables module #29718
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Sweet! Let's see what the test run has to say and hopefully we can get this in today. Nice work here, @thusoy |
| @@ -220,6 +220,17 @@ def maybe_add_negation(arg): | |||
| rule.append('--name {0}'.format(kwargs['name'])) | |||
| del kwargs['match'] | |||
|
|
|||
| if 'match-set' in kwargs: | |||
| if isinstance(kwargs['match-set'], basestring): | |||
There was a problem hiding this comment.
Please change this to if isinstance(kwargs['match-set'], six.string_types): and add from salt.ext import six at the top.
cachedout
added
the
pending-changes
Based on work by @l13t in saltstack#29426. Added tests and fixed incorrect appending of the built rule. Closes saltstack#29423.
|
@cachedout Sure, fixed. |
cachedout
pushed a commit
that referenced
this pull request
Dec 16, 2015
Support match-sets in iptables module
|
Great! Thank you @thusoy |
meggiebot
added
the
bugfix-bckport
|
Need in 2015.8 |
rallytime
added
ZZZ[Done]-back-ported-bf
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Based on work by @l13t in #29426.
Added tests and fixed incorrect appending of the built rule.
Closes #29423 .