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

Merge branch '2017.7.9' into 2017.7

Browse source 
Conflicts:
* requirements/static/centos-6.txt
* requirements/static/centos-7.txt
* requirements/static/debian-8.txt
* requirements/static/debian-9.txt
* requirements/static/fedora-28.txt
* requirements/static/fedora-29.txt
* requirements/static/opensuse-42.txt
* requirements/static/opensuse-leap-15.txt
* requirements/static/ubuntu-14.04.txt
* requirements/static/ubuntu-16.04.txt
* requirements/static/ubuntu-18.04.txt
This commit is contained in:
Pedro Algarvio 2019-03-15 17:05:03 +00:00
commit b14dbc99b8
No known key found for this signature in database
GPG key ID: BB36BF6584A298FF
13 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
requirements/base.txt
View file

@ -2,7 +2,7 @@ Jinja2
# This should be changed to msgpack-python for Packages
# msgpack-python>0.3,!=0.5.5
msgpack>=0.5,!=0.5.5
PyYAML
PyYAML<5.1
MarkupSafe
requests>=1.0.0
tornado>=4.2.1,<6.0; python_version < '3'

2
requirements/static/centos-6.txt
View file

@ -94,7 +94,7 @@ python-gnupg==0.4.4
python-jose==2.0.2 # via moto
pytz==2018.9 # via moto, tempora
pyvmomi==6.7.1.2018.12
pyyaml==5.1
pyyaml==3.13
pyzmq==18.0.1 ; python_version != "3.4"
raet==0.6.8
requests==2.21.0

2
requirements/static/centos-7.txt
View file

@ -94,7 +94,7 @@ python-gnupg==0.4.4
python-jose==2.0.2 # via moto
pytz==2018.9 # via moto, tempora
pyvmomi==6.7.1.2018.12
pyyaml==5.1
pyyaml==3.13
pyzmq==18.0.1 ; python_version != "3.4"
raet==0.6.8
requests==2.21.0

2
requirements/static/debian-8.txt
View file

@ -91,7 +91,7 @@ python-gnupg==0.4.4
python-jose==2.0.2 # via moto
pytz==2018.9 # via moto, tempora
pyvmomi==6.7.1.2018.12
pyyaml==5.1
pyyaml==3.13
pyzmq==18.0.1 ; python_version != "3.4"
raet==0.6.8
requests==2.21.0

2
requirements/static/debian-9.txt
View file

@ -91,7 +91,7 @@ python-gnupg==0.4.4
python-jose==2.0.2 # via moto
pytz==2018.9 # via moto, tempora
pyvmomi==6.7.1.2018.12
pyyaml==5.1
pyyaml==3.13
pyzmq==18.0.1 ; python_version != "3.4"
raet==0.6.8
requests==2.21.0

2
requirements/static/fedora-28.txt
View file

@ -93,7 +93,7 @@ python-gnupg==0.4.4
python-jose==2.0.2 # via moto
pytz==2018.9 # via moto, tempora
pyvmomi==6.7.1.2018.12
pyyaml==5.1
pyyaml==3.13
pyzmq==18.0.1 ; python_version != "3.4"
raet==0.6.8
requests==2.21.0

2
requirements/static/fedora-29.txt
View file

@ -93,7 +93,7 @@ python-gnupg==0.4.4
python-jose==2.0.2 # via moto
pytz==2018.9 # via moto, tempora
pyvmomi==6.7.1.2018.12
pyyaml==5.1
pyyaml==3.13
pyzmq==18.0.1 ; python_version != "3.4"
raet==0.6.8
requests==2.21.0

2
requirements/static/opensuse-42.txt
View file

@ -86,7 +86,7 @@ python-gnupg==0.4.4
python-jose==2.0.2 # via moto
pytz==2018.9 # via moto, tempora
pyvmomi==6.7.1.2018.12
pyyaml==5.1
pyyaml==3.13
pyzmq==18.0.1 ; python_version != "3.4"
raet==0.6.8
requests==2.21.0

4
requirements/static/opensuse-leap-15.txt
View file

@ -2,7 +2,7 @@
# This file is autogenerated by pip-compile
# To update, run:
#
# pip-compile -o requirements/static/opensuse-15.txt requirements/zeromq.txt requirements/raet.txt requirements/pytest.txt requirements/static/opensuse-15.in
# pip-compile -o requirements/static/opensuse-leap-15.txt requirements/zeromq.txt requirements/raet.txt requirements/pytest.txt requirements/static/opensuse-leap-15.in
#
apache-libcloud==1.0.0
asn1crypto==0.24.0 # via cryptography
@ -85,7 +85,7 @@ python-gnupg==0.4.4
python-jose==2.0.2 # via moto
pytz==2018.9 # via moto, tempora
pyvmomi==6.7.1.2018.12
pyyaml==5.1
pyyaml==3.13
pyzmq==18.0.1 ; python_version != "3.4"
raet==0.6.8
requests==2.21.0

2
requirements/static/ubuntu-14.04.txt
View file

@ -91,7 +91,7 @@ python-gnupg==0.4.4
python-jose==2.0.2 # via moto
pytz==2018.9 # via moto, tempora
pyvmomi==6.7.1.2018.12
pyyaml==5.1
pyyaml==3.13
pyzmq==18.0.1 ; python_version != "3.4"
raet==0.6.8
requests==2.21.0

2
requirements/static/ubuntu-16.04.txt
View file

@ -91,7 +91,7 @@ python-gnupg==0.4.4
python-jose==2.0.2 # via moto
pytz==2018.9 # via moto, tempora
pyvmomi==6.7.1.2018.12
pyyaml==5.1
pyyaml==3.13
pyzmq==18.0.1 ; python_version != "3.4"
raet==0.6.8
requests==2.21.0

2
requirements/static/ubuntu-18.04.txt
View file

@ -91,7 +91,7 @@ python-gnupg==0.4.4
python-jose==2.0.2 # via moto
pytz==2018.9 # via moto, tempora
pyvmomi==6.7.1.2018.12
pyyaml==5.1
pyyaml==3.13
pyzmq==18.0.1 ; python_version != "3.4"
raet==0.6.8
requests==2.21.0

8
salt/cloud/__init__.py
View file

@ -1288,16 +1288,16 @@ class Cloud(object):
start = int(time.time())
while int(time.time()) < start + 60:
# We'll try every <timeout> seconds, up to a minute
mopts_ = salt.config.DEFAULT_MINION_OPTS
mopts_ = salt.config.DEFAULT_MASTER_OPTS
conf_path = '/'.join(self.opts['conf_file'].split('/')[:-1])
mopts_.update(
salt.config.minion_config(
salt.config.master_config(
os.path.join(conf_path,
'minion')
'master')
)
)
client = salt.client.get_local_client(mopts=self.opts)
client = salt.client.get_local_client(mopts=mopts_)
ret = client.cmd(
vm_['name'],