Commit Graph

71908 Commits

Author SHA1 Message Date
Nicole Thomas
6394030db3 Add VirtuozzoLinux is yumpkg enable list. (#34902) 2016-07-22 16:43:23 -06:00
Mike Place
38ac79d8bb Merge pull request #34829 from gtmanfred/py3
[PY3] tests.unit.pillar
2016-07-22 16:33:47 -06:00
Mike Place
6ccc27f697 Merge pull request #34898 from hrumph/list_upgrades_refresh
Stop multiple refreshes during call to pkg.list_upgrades
2016-07-22 16:28:42 -06:00
Mike Place
5e0c63c0eb Merge pull request #34886 from eradman/cron
Preserve trailing lines in crontab
2016-07-22 16:25:23 -06:00
Mike Place
ad640cc046 Merge pull request #34901 from rallytime/fix-34893
Add VirtuozzoLinux to the list of enabled distros for rpm.py
2016-07-22 16:23:48 -06:00
Mike Place
365fca3c60 Merge pull request #34895 from skizunov/develop2
Fix console and file logging on Windows
2016-07-22 16:23:32 -06:00
Nicole Thomas
bdafa60e6a Lint #34897 (#34907) 2016-07-22 16:22:30 -06:00
Mike Place
345e3e56b8 Merge pull request #34899 from rallytime/integration-cli-tests
Fix integration/cli/*.py test failures when Running in Python 3
2016-07-22 16:22:11 -06:00
Mike Place
5aa532f98b Merge pull request #34900 from rallytime/fix-34890
Add VirtuozzoLinux to enabled platforms list in rh_service.py
2016-07-22 16:21:20 -06:00
Jeremy McMillan
b1e5cdbe88 salt-cloud -f post_dns_record support (#34897)
refactor arguments in salt.cloud.clouds.digital_ocean.post_dns_record() to enable use with salt-cloud --function on command line

#34884
2016-07-22 16:20:57 -06:00
Mike Place
cdfd0161fc Set timeout for run_salt in test suite 2016-07-22 16:14:25 -06:00
Nicole Thomas
df372c8749 Merge pull request #34905 from rallytime/remove-tests
Remove tests that don't test anything
2016-07-22 16:13:57 -06:00
rallytime
56fb834718 Remove tests that don't test anything 2016-07-22 16:12:16 -06:00
Mike Place
ab84fd273e Merge pull request #34637 from cachedout/int_tests_interfaces
Int tests interfaces
2016-07-22 15:58:59 -06:00
rallytime
45e2ce10a4 Add VirtuozzoLinux to the list of enabled distros for rpm.py 2016-07-22 14:46:45 -06:00
rallytime
12824487cc Add VirtuozzoLinux to enabled platforms list in rh_service.py
Fixes #34890
2016-07-22 14:43:09 -06:00
rallytime
ed5b89655a Transform unicode string to bytes before hashing 2016-07-22 14:31:55 -06:00
rallytime
1031f19f3d Update batch integration tests to not be flaky in Python3 2016-07-22 14:19:15 -06:00
Thomas S Hatch
82f4ff6a83 Merge pull request #34889 from techhat/regpersist
Add load_reg and save_reg for Thorium
2016-07-22 13:52:20 -06:00
Michael Walton
acd4b1a23b Fixes #33620 2016-07-22 15:46:29 -04:00
Mike Place
403854dac7 Merge pull request #34896 from skizunov/develop3
Fix unbound local variable error
2016-07-22 13:14:20 -06:00
Sergey Kizunov
9ee1ea8629 Fix unbound local variable error
I have occasionally come across this error while running a salt-minion on
Windows using Python 3.5.1 and the TCP transport:

'''
  File "...\salt\crypt.py", line 498, in _authenticate
    if not error:
UnboundLocalError: local variable 'error' referenced before assignment
[WARNING ] Minion received a SIGINT. Exiting.
'''

It seems like there is an overloaded use of the local variable called
`error`, each use with a different lifespan. Changed it so that `error`
is no longer overloaded. This has fixed the issue.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
2016-07-22 14:02:46 -05:00
Sergey Kizunov
950cf79cd4 Fix console and file logging on Windows
On Windows, only the main process properly logged to console and to
file. Things worked on other OSes due to the logging configuration
being propogated via fork, something that won't work on Windows.

The new strategy for Windows is if multiprocessing mode is used,
all console and file logging will be performed through the
Multiprocessing Logging Listener except for the main process. The
main process does not send stuff to the Multiprocessing Logging Listener.
Hence the main process will still configure file and console logging
separately from the MP Logging Listener.
If multiprocessing mode is off, then logging will be done as before
(which should be ok since there is only one process).

salt/utils/parsers.py:
- Broke apart the logic that figures out the input options for
`log.setup_logfile_logger` and `log.setup_console_logger`. This
functionality is run before `self._setup_mp_logging_listener` so that
the options passed to the MP Logging Listener are appropriate for direct
use in the functions that setup the console and file logging in the
MP Logging Listener process.
- Moved the logic that verifies the path for the log file from
`cli/daemons.py` to be able to run it before creating the MP Logging
Listener. Its original place in `cli/daemons.py` would run after the
MP Logging Listener is created.

salt/log/setup.py:
- Invoke `setup_console_logger` and `setup_logfile_logger` using the
appropriate options if running on Windows.

salt/minion.py:
- No longer need to invoke the functions to setup the console and file
logging on Windows multiprocessing mode due to the MP Logging
Listener taking care of that on Windows.

salt/cli/daemons.py:
- Moved the logic that verifies the path for the log file to
`utils/parsers.py`.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
2016-07-22 13:57:43 -05:00
Nicole Thomas
ebebfa647f Merge pull request #34887 from rallytime/merge-2016.3
[2016.3] Merge forward from 2015.8 to 2016.3
2016-07-22 12:04:47 -06:00
Joseph Hall
590de80010 Fix __opts__ 2016-07-22 11:42:51 -06:00
Joseph Hall
3de9dbffe5 Fix msgpack functions 2016-07-22 11:41:31 -06:00
Thomas S Hatch
5c13ee0e72 Merge pull request #34606 from isbm/isbm-config-reading-exit-2015.8
Bugfix: Exit on configuration read (backport)
2016-07-22 11:35:18 -06:00
Thomas S Hatch
eba34f7f4c Merge pull request #34632 from eliasp/2016.3-create-logdir-when-needed
Try to create the log directory when not present yet
2016-07-22 11:34:31 -06:00
Thomas S Hatch
1c5dacdb00 Merge pull request #34615 from techhat/winapi
Properly gate pythoncom
2016-07-22 11:26:49 -06:00
Thomas S Hatch
a2cba5fd6c Merge pull request #34758 from adelcast/dev/adelcast/avahi_beacon
Add avahi based beacon for zeroconf announcement
2016-07-22 11:25:54 -06:00
Thomas S Hatch
965f517889 Merge pull request #34854 from rallytime/cleanup-state-imports
Remove string_types import from state compiler
2016-07-22 11:20:15 -06:00
Thomas S Hatch
584d7606d4 Merge pull request #34865 from thatch45/break_suse
This needs discussion, since this breaks SUSE
2016-07-22 11:19:34 -06:00
Joseph Hall
dcb8f2b983 Allow register_returner to be Non 2016-07-22 11:03:04 -06:00
rallytime
39f69ef563 Update serializers/configparser.py for Py3 use.
SafeConfigParser and readfp are deprecated in Python 3.2.
2016-07-22 10:52:48 -06:00
Joseph Hall
b552c853ed Add load_reg and save_reg for Thorium 2016-07-22 10:37:03 -06:00
rallytime
109b368d19 Merge branch '2015.8' into '2016.3'
No conflicts.
2016-07-22 10:32:59 -06:00
Eric Radman
b9be6521db Preserve trailing lines in crontab
This allows cron.file to install a crontab file that contains trailing
newlines. Previously a change may have been detected on every run.
2016-07-22 12:18:08 -04:00
Thomas S Hatch
fb223e1bd4 Invalidate the target cache very quickly (#34862) 2016-07-22 09:34:08 -06:00
Bo Maryniuk
87ffd6dc1e Regression fix: minion ID generator should use FQDN first, if available (#34876)
* Regression fix: use FQDN first, if available

* Adjust the tests to the new behaviour (FQDN first)
2016-07-22 09:21:42 -06:00
Alejandro Bednarik
5cdec8ced8 Add VirtuozzoLinux is yumpkg enable list. (#34878) 2016-07-22 09:18:13 -06:00
Alejandro Bednarik
99c872bb7f modules.proxy: __virtual__ return err msg (#34879) 2016-07-22 09:16:59 -06:00
rallytime
74002ab9e7 Pylint fix 2016-07-22 09:13:33 -06:00
Erik Johnson
1ca1367289 Fail git.latest states with uncommitted changes when force_reset=False (#34869)
* Add git.diff function

* Fail git.latest states with uncommitted changes when force_reset=False

Also, discard these changes when running the state if force_reset=True.

* Add integration test for case where there are uncommitted changes
2016-07-22 09:04:05 -06:00
Owen Synge
8da76013a6 salt.states.ceph: Import execution module for ceph.
This ceph state depend upon a ceph configuration library python_ceph_cfg.

    https://github.com/oms4suse/python-ceph-cfg

This code was originally developed in the sesceph module:

    https://github.com/oms4suse/sesceph

Signed-off-by: Owen Synge <osynge@suse.com>
2016-07-22 10:55:18 +02:00
Owen Synge
be6e993008 salt.modules.ceph: Import execution module for ceph.
This ceph module depend upon a ceph configuration library python_ceph_cfg.

    https://github.com/oms4suse/python-ceph-cfg

This code was originally developed in the sesceph module:

    https://github.com/oms4suse/sesceph

It contains contributions from:

    Alex Lau (AvengerMoJo) <AvengerMoJo@gmail.com>
    Jan Fajerski <jfajerski@suse.com>

Signed-off-by: Owen Synge <osynge@suse.com>
2016-07-22 10:54:31 +02:00
Anthony Shaw
7e5cf2676b
fix munged merge 2016-07-22 14:31:52 +10:00
Anthony Shaw
7f31ccbf1e Merge branch 'develop' of github.com:saltstack/salt into develop 2016-07-22 13:19:34 +10:00
Thomas S Hatch
6c5f363921 This needs discussion, since this breaks SUSE
But it does fix all other distros....
2016-07-21 16:37:43 -06:00
rallytime
9cc385cfcb Python3 doesn't have contextlib.nested
The with statement supports the nested functionality by default.
2016-07-21 15:38:00 -06:00
rallytime
2eea37739d Skip boto_elb unit tests for Py3
These tests were written use the boto.ec2.elb class, which doesn't
exist in Python3. These tests need to be rewritten to run in Py3.
2016-07-21 15:05:37 -06:00