saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Specify the right versions for pyzmq and libzmq

Browse source
This commit is contained in:
Mircea Ulinic 2017-11-22 14:30:08 +00:00
parent 101e8f0837
commit c48db41cc4
No known key found for this signature in database
GPG key ID: 4286FAD4BACBB073
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/ref/configuration/minion.rst
View file

@ -376,7 +376,7 @@ See :conf_minion:`ipv6` for IPv6 connections to the Master.
This option requires modern version of the underlying libraries used by
the selected transport:
- ``zeromq`` requires ``pyzmq`` >= 16.0.3
- ``zeromq`` requires ``pyzmq`` >= 16.0.1 and ``libzmq`` >= 4.1.6
- ``tcp`` requires ``tornado`` >= 4.5
Configuration example:

13
salt/transport/zeromq.py
View file

@ -73,12 +73,11 @@ def _get_master_uri(master_ip,
Source: http://api.zeromq.org/4-1:zmq-tcp
'''
zmq_version_tup = tuple(map(int, zmq.pyzmq_version().split('.')))
if zmq_version_tup >= (16, 0, 3):
# TODO: still not clear from the pyzmq release notes when this has been introduced
# in 14.0.4 this feature is not supported, but we can use it in 16.0.3.
# So it must be somewhere between, but the changelog does not state that:
# http://pyzmq.readthedocs.io/en/latest/changelog.html
libzmq_version_tup = tuple(map(int, zmq.zmq_version().split('.')))
pyzmq_version_tup = tuple(map(int, zmq.pyzmq_version().split('.')))
if libzmq_version_tup >= (4, 1, 6) and pyzmq_version_tup >= (16, 0, 1):
# The source:port syntax for ZeroMQ has been added in libzmq 4.1.6
# which is included in the pyzmq wheels starting with 16.0.1.
if source_ip or source_port:
if source_ip and source_port:
return 'tcp://{source_ip}:{source_port};{master_ip}:{master_port}'.format(
@ -94,7 +93,7 @@ def _get_master_uri(master_ip,
master_ip=master_ip, master_port=master_port)
if source_ip or source_port:
log.warning('Unable to connect to the Master using a specific source IP / port')
log.warning('Consider upgrading to pyzmq >= 16')
log.warning('Consider upgrading to pyzmq >= 16.0.1 and libzmq >= 4.1.6')
return 'tcp://{master_ip}:{master_port}'.format(
master_ip=master_ip, master_port=master_port)