Back-port #29467 to 2015.5 #31689
Merged
Back-port #29467 to 2015.5 #31689
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
using module.run to check if port 53 is opened on localhost, using module network.connect
example state:
~~~
network.connect:
module.run:
- host: {{ salt['network.ipaddrs']()|join }}
- port: 53
- port: 1234
- proto: udp
unexpected behavior:
module.run will always succeed,
even If network.connect returns result: False
example output (before the change):
----------
ID: network.connect
Function: module.run
Result: True
Comment: Module function network.connect executed
Started: 22:28:29.475623
Duration: 0.001 ms
Changes:
----------
ret:
----------
comment:
Unable to connect to 10.0.0.50 (10.0.0.50) on tcp port 1234
result:
False
Proposal:
Proposing to check changes_ret.result and return it as a result before trying to check changes_ret.retcode
tested expected behavior:
~~~
----------
ID: network.connect
Function: module.run
Result: False
Comment: Module function network.connect executed
Started: 22:50:25.149832
Duration: 9.964 ms
Changes:
----------
ret:
----------
comment:
Unable to connect to 10.0.0.50 (10.0.0.50) on tcp port 1234
result:
False
----------
ID: network.connect
Function: module.run
Result: True
Comment: Module function network.connect executed
Started: 22:50:07.129629
Duration: 0.205 ms
Changes:
----------
ret:
----------
comment:
Successfully connected to 10.0.0.50 (10.0.0.50) on tcp port 53
result:
True
|
Go Go Jenkins! |
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.
Back-port #29467 to 2015.5 as requested in #30559. The bug this is fixing is present on the 2015.5 branch, too.