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

2018.3: transport.zmq: fix bug introduced by b7df7e75cf2 #52505

Merged
merged 1 commit into from Apr 11, 2019

Conversation

@mattp-
Copy link
Contributor

commented Apr 11, 2019

What does this PR do?

this change was introduced to address evidently another bug where
somehow self.opts has no master_uri - but in the process it prioritized
using master_ip over master_uri even when master_uri is there.
providing master_uri as a way of specifiying which msater you would like
to create a channel for is documented used elsewhere in the codebase in
multi-master scenarios (ie, event.send, saltutil.revoke_auth)

Previous Behavior

event.send/saltutil.revoke_auth, anywhere else relying on master_uri doing the right thing are broken on 2018 on

New Behavior

master_uri kwarg respected again

Tests written?

yes

Commits signed with GPG?

Yes/No

Please review Salt's Contributing Guide for best practices.

See GitHub's page on GPG signing for more information about signing commits with GPG.

@dwoz

This comment has been minimized.

Copy link
Contributor

commented Apr 11, 2019

@mattp- Check the linter errors please. :)

this change was introduced to address evidently another bug where
somehow self.opts has no master_uri - but in the process it prioritized
using master_ip over master_uri even when master_uri _is_ there.
providing master_uri as a way of specifiying which msater you would like
to create a channel for is documented used elsewhere in the codebase in
multi-master scenarios (ie, event.send, saltutil.revoke_auth)
@mattp- mattp- force-pushed the bloomberg:2018_zmq_uri branch from 1638b8a to b682ec5 Apr 11, 2019
@mattp-

This comment has been minimized.

Copy link
Contributor Author

commented Apr 11, 2019

@dwoz sorry - lint clean now

@dwoz

This comment has been minimized.

Copy link
Contributor

commented Apr 11, 2019

@mattp- Great, nice work!

@dwoz
dwoz approved these changes Apr 11, 2019
@dwoz dwoz merged commit 9b7a0d1 into saltstack:2018.3 Apr 11, 2019
10 checks passed
10 checks passed
WIP Ready for review
Details
continuous-integration/jenkins/pr-merge This commit looks good
Details
jenkins/pr/docs The docs job has passed
Details
jenkins/pr/lint Python lint test has passed
Details
jenkins/pr/py2-centos-7 The py2-centos-7 job has passed
Details
jenkins/pr/py2-ubuntu-1604 The py2-ubuntu-1604 job has passed
Details
jenkins/pr/py2-windows-2016 The py2-windows-2016 job has passed
Details
jenkins/pr/py3-centos-7 The py3-centos-7 job has passed
Details
jenkins/pr/py3-ubuntu-1604 The py3-ubuntu-1604 job has passed
Details
jenkins/pr/py3-windows-2016 The py3-windows-2016 job has passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.