valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
74,452 Commits 24 Branches 182 Tags 341 MiB
0aab883180
Commit Graph

74452 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
0aab883180
Merge branch '2016.3' into 3_carbon 2016-10-25 16:13:44 +09:00
Mike Place
ca78ffbfc2 Merge pull request #37184 from rallytime/merge-carbon 
[carbon] Merge forward from 2016.3 to carbon
 2016-10-25 16:11:37 +09:00
Mike Place
6767d5dcdb Remove repr flag from format 
Per pylint
 2016-10-25 16:11:08 +09:00
Mike Place
e19ee88b6b Merge pull request #37206 from cachedout/transport_test_hang 
Address transport test hang
 2016-10-25 14:25:55 +09:00
Mike Place
6737fd3ad9 Merge pull request #37179 from isbm/isbm-fix-saltapi-ssh-crash-2016-3 
Fix Salt-API ssh crash (2016.3)
 2016-10-25 13:52:19 +09:00
Mike Place
815dfd1c04 Merge pull request #37183 from gtmanfred/2016.3 
load tags should reference the actual load tags
 2016-10-25 13:38:00 +09:00
Mike Place
ca63376c97 Merge pull request #37188 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-10-25 13:37:25 +09:00
Mike Place
c4393d5e9e
Address transport test hang 
It would appear that if an attribute error is raised when trying to detect a class atter,
that the test suite does not run the class teardown method but continues regardless. This
fixes the class attr error which then allows the teardown to run. Prior to this, if the
teardown did not run, the entire suite would hang out shutdown because it was blocked
on waiting for a ioloop to terminate.
 2016-10-25 13:16:35 +09:00
rallytime
ccb664050d Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-10-24 10:20:46 -06:00
rallytime
063ddfd7ce Merge branch '2016.3' into 'carbon' 
No conflicts.
 2016-10-24 10:16:17 -06:00
Nicole Thomas
d7e28d24a4 Pylint fix for 2016.3 (#37186) 
Refs #37175
 2016-10-24 09:42:41 -06:00
rallytime
027e2212c9 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - salt/modules/status.py
  - salt/modules/win_status.py
  - salt/modules/zypper.py
  - salt/utils/network.py
  - tests/unit/transport/zeromq_test.py
 2016-10-24 09:29:53 -06:00
Daniel Wallace
1b7b4b1a0c load tags should reference the actual load tags 
Closes #37176
 2016-10-24 10:02:57 -05:00
Bo Maryniuk
28edda457e Do not prematurily raise an exception, let the main loop take care of it instead 2016-10-24 15:35:23 +02:00
Bo Maryniuk
372f2bbd93 Do not restart the whole thing if roster is not around 2016-10-24 15:35:13 +02:00
Bo Maryniuk
8d1450cc47 Fix PEP8 2016-10-24 15:35:03 +02:00
Mike Place
0d7af935e5 Merge pull request #37175 from cachedout/fix_test_hange 
Fix test hang
 2016-10-24 18:55:37 +09:00
Mike Place
0fecb5ff2e
Remove sleep. Thanks @s0undt3ch 2016-10-24 18:38:49 +09:00
Mike Place
cedc609503
Fix test suite hang on salt testing 
We don't need to clean up here since the test suite will handle it for us.
 2016-10-24 15:52:33 +09:00
Mike Place
b3e79dcd51 Merge pull request #37139 from awerner/fix-spm-download-remote-download 
Download spm package from remote repository and save it to cache
 2016-10-24 12:29:05 +09:00
Mike Place
1e97df7540 Merge pull request #37142 from DSRCorporation/bugs/36866_salt-minion_communication_broken 
status.master: don't fail if host_to_ips returns None
 2016-10-24 12:21:23 +09:00
Mike Place
334313ec64 Merge pull request #37144 from DSRCorporation/bugs/36866_salt-minion_communication_broken_2016.3 
Bugs/36866 salt minion communication broken 2016.3
 2016-10-24 12:19:06 +09:00
Mike Place
c5d81a8ade Merge pull request #37158 from jfindlay/mac_skip_uptime 
add mock for `status.uptime` unit test
 2016-10-24 12:13:53 +09:00
Mike Place
af8bf25258 Merge pull request #37160 from rallytime/merge-carbon 
[carbon] Merge forward from 2016.3 to carbon
 2016-10-24 12:13:30 +09:00
Mike Place
e51f90b459 Merge pull request #37161 from rallytime/bp-37098 
Back-port #37098 to 2016.3
 2016-10-24 12:13:14 +09:00
Nicole Thomas
b5025c044e Merge pull request #37159 from rallytime/bp-37107 
Back-port #37107 to 2016.3
 2016-10-22 07:55:47 -06:00
rallytime
240fb45c5c Pylint fix 2016-10-22 07:54:44 -06:00
Nicole Thomas
35b4494157 Merge pull request #37162 from rallytime/bp-36823 
Back-port #36823 to 2015.8
 2016-10-22 07:52:53 -06:00
Nicole Thomas
1e520b3f48 Merge pull request #37163 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-10-22 07:52:36 -06:00
rallytime
8fff95b3b4 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/modules/gpg.py
  - salt/modules/zypper.py
 2016-10-21 16:09:17 -06:00
Erik Johnson
3032a542d9 Use NotifyAccess=all in all unit files 
When systemd-python is not installed, systemd notification falls back to
using the systemd-notify for service notification. This cannot be used
however unless the unit has NotifyAccess=all set.

The particular use case for this is when Salt is installed using pip. We
don't put systemd-python into the requirements.txt because we can't be
sure that the minion supports systemd, so pip installs won't necessarily
have systemd-python available.
 2016-10-21 15:56:47 -06:00
Erik Johnson
4826995973 Remove EnvironmentFile and Restart lines from unit files 
These shouldn't be there, because the variables sourced by the
EnvironmentFile are only made available to the Exec commands in the unit
file.
 2016-10-21 15:56:47 -06:00
Erik Johnson
3be15694d2 Use Type=notify for debian systemd units 2016-10-21 15:56:47 -06:00
Robert James Hernandez
d58fda6f67 Use control-group default for killmode 2016-10-21 15:56:47 -06:00
Mike Adams
36bc2a1ded Add run_on_start to SCHEDULE_CONF 
This is a fix for 37037.
 2016-10-21 15:55:10 -06:00
do3meli
c63126a2f0 removed trailing whitespaces in apache_module.py 2016-10-21 15:53:24 -06:00
do3meli
a812cbfea7 use versionadded and deprecated warnings in apache_module 2016-10-21 15:53:24 -06:00
Justin Findlay
094eac06eb modules.status.uptime unit test: mock on linux 2016-10-21 15:50:42 -06:00
rallytime
caa8fc9169 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - pkg/deb/salt-api.service
  - pkg/deb/salt-master.service
  - salt/client/__init__.py
  - salt/fileclient.py
  - salt/modules/cp.py
  - salt/modules/status.py
  - tests/integration/__init__.py
  - tests/integration/modules/cp.py
 2016-10-21 15:50:03 -06:00
Nicole Thomas
2bc5dedd06 Allow the minion test daemons a couple of tries to connect to the master (#37150) 
When running the tests with the tcp transport, we are not as forgiving
with the minion connection process as we are in ZMQ. In ZMQ, we attempt
to connect to the master. If it isn't up yet, we wait and try again. In
TCP, we try to connect to the master once, realize it's not up (because
the master process takes longer to spin up than the minions) and crash
and bail out.

This just gives the master a little more time to come up by having the
minions try to connect a couple more times.
 2016-10-21 14:50:39 -06:00
Nicole Thomas
ec7ad9eebe Add note about salt-bootstrap known issue for 2016.3.4 (#37152) 
* Add note about salt-bootstrap known issue for 2016.3.4

Refs https://github.com/saltstack/salt-bootstrap/issues/973

* Add bootstrap release known issue to 2016.3.3 release notes, too.
 2016-10-21 14:46:35 -06:00
Mike Place
7908819b70 Merge pull request #37145 from cachedout/gate_github_test 
Don't run ssh tests if we can't reach external server
 2016-10-21 23:16:57 +09:00
Mike Place
8de7b39b5e Merge pull request #37135 from Cloudtek/x509-docs-fix 
Fix example signing policy in salt.states.x509 docs
 2016-10-21 20:45:22 +09:00
Mike Place
f4ce268d51
Don't run ssh tests if we can't reach external server 2016-10-21 19:47:05 +09:00
Mike Place
a5335a2f15 Merge pull request #37137 from awerner/fix-spm-msgpack 
SPM-METADATA are now loaded as yaml from remote URLs
 2016-10-21 18:52:40 +09:00
Mike Place
a606a42575 Minor style change 
Double-quotes to single-quotes, per SaltStack style guide.
 2016-10-21 18:39:40 +09:00
Mike Place
41ae90d3c3 Merge pull request #37140 from vutny/pkgbuild-repo-sign-with-no-passphrase 
pkgbuild.repo: fix GPG signing with `use_passphrase=False`
 2016-10-21 18:37:54 +09:00
Dmitry Kuzmenko
87c2e93e40 Don't fail if host_to_ips returns None. 2016-10-21 12:29:03 +03:00
Dmitry Kuzmenko
f625e6d3a9 Updated host_to_ip to return all the IPs instead of the first one. 
This fixes the bug #36866 where minion gets __master_disconnected right
after connect because '::1' isn't in the list of connected masters that
is ['127.0.0.1'].
 2016-10-21 12:28:32 +03:00
Dmitry Kuzmenko
f07d5f602c Don't fail if host_to_ips returns None. 2016-10-21 12:06:42 +03:00