Commit Graph

51913 Commits

Author SHA1 Message Date
Viet Hung Nguyen
d6dc09af64 enhance doc, as usermod on ubuntu 12.04 will not CREATE home 2015-04-22 12:46:15 +07:00
Viet Hung Nguyen
0ce4d7feb6 refactor: force to use boolean 2015-04-22 12:46:15 +07:00
Viet Hung Nguyen
849d19edd7 log debug the creating dir process 2015-04-22 12:46:14 +07:00
Viet Hung Nguyen
c4e95b9f48 fix #18843: usermod won't create a dir if old home does not exist
usermod only MOVE old home to new path. So create home dir by salt.
2015-04-22 12:46:04 +07:00
Thomas Jackson
98af7c3f95 Cleanup jinja attribute access for loader
Refactor of #22723
2015-04-21 22:39:17 -07:00
Justin Findlay
775bee936a Merge pull request #22909 from virtua-network/fix_pkgin_parser
Fix compatibility with pkgin > 0.7
2015-04-21 22:48:43 -06:00
Justin Findlay
399399f89e localemod.gen_locale now always returns a boolean
Related to #22829, also fixes #21140.
2015-04-21 22:31:56 -06:00
Justin Findlay
ca27f0d0c0 fix pip module saltenv requirements handling
Fix a stack trace that happens if the requirements.txt file cannot be
found in the given saltenv.
2015-04-21 22:26:52 -06:00
Justin Findlay
a0e253df95 Merge pull request #22927 from jfindlay/merge_22922
[develop] lint fixes
2015-04-21 22:19:36 -06:00
Gideon Redelinghuys
c0e2f2d104 Have fileclient check if file exists on server before modifying file system on minion 2015-04-21 22:15:28 -06:00
Pedro Algarvio
f7e6f716e3 Make PEP-8 checker happier 2015-04-21 20:35:14 -06:00
Pedro Algarvio
b831d14bfc Properly indent comments 2015-04-21 20:35:14 -06:00
Pedro Algarvio
5f7ab3dc36 Another PEP-8 preciosity disabled 2015-04-21 20:35:14 -06:00
Pedro Algarvio
4617f03dda Make PEP-8 happier 2015-04-21 20:35:14 -06:00
Pedro Algarvio
23ad161531 Additionally ignore import-error 2015-04-21 20:35:14 -06:00
Pedro Algarvio
492c6513bb Fix W1504(unidiomatic-typecheck)
Using type() instead of isinstance() for a typecheck.
2015-04-21 20:35:14 -06:00
Dmitry Kuzmenko
8b6c7ee08b Flush returners queue before salt master shutdown 2015-04-22 05:33:08 +03:00
Justin Findlay
d34e7c0585 Merge pull request #22926 from rallytime/pylint-dev
Python 3 compat for salt/auth/pam.py
2015-04-21 20:30:45 -06:00
Justin Findlay
6890752dd3 Merge pull request #22925 from rallytime/bp-22895
Backport #22895 to 2014.7
2015-04-21 20:30:26 -06:00
Justin Findlay
4db13ee454 Merge pull request #22924 from rallytime/bp-22829
Backport #22829 to 2015.2
2015-04-21 20:29:56 -06:00
Justin Findlay
049276af44 Merge pull request #22921 from s0undt3ch/hotfix/lint-2015.2
Another PEP-8 preciosity disabled
2015-04-21 20:28:42 -06:00
Justin Findlay
53001566e0 Merge pull request #22882 from freimer/issue_22880
Fix for issue #22880, this should be **kwarg, not kwarg=None.
2015-04-21 20:28:03 -06:00
rallytime
f61abb0c37 Python 3 compat for salt/auth/pam.py 2015-04-21 19:24:55 -06:00
rallytime
3852d96213 Pylint fix 2015-04-21 19:19:08 -06:00
Alexandre Letourneau
90f7829ad3 Fixed pylint issues 2015-04-21 19:18:48 -06:00
Alexandre Letourneau
5ebf159554 Cleaned up pull request 2015-04-21 19:18:39 -06:00
Alexandre Letourneau
a08ac478f6 pam_tally counter was not reset to 0 after a succesfull login 2015-04-21 19:17:47 -06:00
Felix Dreissig
468d392074 Adjust tests to the new return value of modules.localemod.gen_locale() 2015-04-21 19:11:33 -06:00
Felix Dreissig
16136f49ec Always return a boolean in modules.localemod.gen_locale()
This makes the behavior consistent with set_locale() and the error case.
states.locale.present() already expects a boolean return value;
therefore, this will probably resolve saltstack/salt#21140.
2015-04-21 19:10:43 -06:00
Nicole Thomas
f870f75b46 Merge pull request #22920 from cachedout/dns_check_err
Better err handling for unresoveable master addr
2015-04-21 19:00:00 -06:00
Nicole Thomas
522d1d8468 Merge pull request #22917 from twangboy/upd_icon
Updated icon file for windows
2015-04-21 18:56:47 -06:00
Nicole Thomas
eca37ebc11 Merge pull request #22914 from cachedout/issue_22790
Call proper returner function in jobs.list_jobs
2015-04-21 18:49:01 -06:00
Nicole Thomas
44f3409b01 Merge pull request #22918 from JaseFace/git-pillar-provider-doc-note
Add a note to the git_pillar docs stating that GitPython is the only currently supported provider
2015-04-21 18:48:26 -06:00
Nicole Thomas
2793ad667b Merge pull request #22911 from rallytime/test_fixes
Fix some Python 2.6-related test failures on 2015.2
2015-04-21 18:44:37 -06:00
Bruce Sherrod
d8e5b07348 add test mode, pager_service, cleanup 2015-04-21 17:17:27 -07:00
Pedro Algarvio
430c5cfdf7 Another PEP-8 preciosity disabled 2015-04-22 00:46:20 +01:00
Ralph M Goodberlet
a81b0e5767 Added _upg_tools_helper() function to upgrade vmware tools on a VM object. Reworked upgrade_tools() to use _upg_tools_helper() function and added upgrade_tools_all() to upgrade vmware tools on all VMs for a specified provider. 2015-04-21 19:17:30 -04:00
Mike Place
bac22b1261 Better err handling for unresoveable master addr 2015-04-21 17:14:51 -06:00
Jason Wolfe
0aee5c23d4 Add a note to the git_pillar docs stating that GitPython is the only currently supported provider 2015-04-21 15:53:26 -07:00
salt_build
7cbabd0cf9 Updated icon file for windows 2015-04-21 22:33:59 +00:00
Mike Place
5d48bc3c07 Raise exception on render error
Closes #22512
2015-04-21 16:12:44 -06:00
Colton Myers
d23ee2f80a Merge pull request #22915 from basepi/boto_rds.version_added
Update versionadded for boto_rds modules
2015-04-21 16:06:14 -06:00
Colton Myers
073f79adb1 Update versionadded for boto_rds modules 2015-04-21 16:06:05 -06:00
Nicole Thomas
31c461f573 Merge pull request #22907 from techhat/cloudconfig
Properly merge cloud configs to create profiles
2015-04-21 16:02:44 -06:00
Mike Place
d828d6fd58 Call proper returner function in jobs.list_jobs
Closes #22790
2015-04-21 15:23:48 -06:00
Sergey Kizunov
af65bba00b Fix Windows salt-master support for ZeroMQ
The following changes were required:

salt/master.py:
- 'SMaster.aes' no longer exists. 'SMaster.secrets' now does. The
pickling code is adjusted accordingly.
- MWorker __init__ no longer uses 'self.serial'. 'self.req_channels'
was added. The pickling code is adjusted accordingly.
- On Windows, Service account home directories may not initially exist.
If this is the case, make sure the directory exists before continuing.

salt/minion.py:
- The 'Minion' __init__ function will not set certain fields that are
required in '_thread_return'. On Windows, '_thread_return' will
instantiate a new object that is derived from 'MinionBase', and this
object may be a 'Minion' object. Due to this, make sure that the
required fields are set before they are used.

salt/transport/zeromq.py:
- ZeroMQ for Windows doesn't support 'IPC' mode. Due to this, allow
'ipc_mode' to be set to 'tcp' and react accordingly.

General:
On Windows os.rename() will fail if the destination file exists. Due to
this, use 'salt.utils.atomicfile.atomic_rename' where appropriate.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
2015-04-21 16:01:01 -05:00
Thomas S Hatch
11ea3f99fc late init the lazy loader
due to slight changes in python3 how inherited classes seem to be
loaded we need to late call the subclass __init__ method
2015-04-21 14:29:32 -06:00
rallytime
cac386247c Skip the network state unit tests if sustem is on Python 2.6
These tests need to be refactored to be able to run on Python 2.6
2015-04-21 14:13:58 -06:00
Fred Reimer
7958e19e9a Merge remote-tracking branch 'upstream/2015.2' into issue_22880 2015-04-21 15:03:41 -04:00
Thomas S Hatch
f0939754a0 Merge pull request #22894 from 0xf10e/2014.7
Fix issue #22782
2015-04-21 12:55:18 -06:00