valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
45,118 Commits 24 Branches 182 Tags 341 MiB
048d3f31ff
Commit Graph

45118 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Erik Johnson
048d3f31ff Merge lxc.cloned into lxc.created state, rename to lxc.present 
Also remove another redundant state which can be run using module.run.
 2015-02-10 15:06:44 -06:00
Erik Johnson
8165aeeae4 Remove snapshot from clone args 
Let it live in kwargs so that it can be part of a profile
 2015-02-10 15:06:44 -06:00
Erik Johnson
30c3a7f0fb Fix creation of container from image 
Also changed return data for create() to match destroy(), clone(), etc.
 2015-02-10 15:06:44 -06:00
Erik Johnson
b06bd4f8df Add self.strerror to SaltException class 
This helps avoid deprecation warnings that happen when self.message is
referenced.
 2015-02-10 15:06:43 -06:00
Erik Johnson
e297fd4102 Complete LXC refactor 2015-02-10 15:06:43 -06:00
Erik Johnson
728488e90b Tweak section header 2015-02-10 15:06:43 -06:00
Erik Johnson
4134af175e Further work on lxc refactor 
Most functions are now refactored. Also added functions to match the
ones in cmdmod.py so that running commands within containers more
closely resembles running commands on minions themselves.
 2015-02-10 15:06:43 -06:00
Erik Johnson
86f9dfa8e5 Modify lxc.created state, remove lxc.set_pass state 
This commit modifies the lxc.created state to catch exceptions raised by
the lxc execution module. Additional states will follow.

If passwords need to be set, they can be done with a module.run state.
This function is not stateful and thus would run every time, making it a
bad fit as a state.
 2015-02-10 15:06:43 -06:00
Erik Johnson
196a7d6327 Stub for LXC tutorial 2015-02-10 15:06:43 -06:00
Erik Johnson
8e958494c1 Add missing gather_bootstrap_script function 
This is required by lxc.bootsrap but was only present in the develop
branch.
 2015-02-10 15:06:43 -06:00
Erik Johnson
c79d867db2 Add stdin and output_loglevel args to cmd.run_chroot 
Also allow the cmd function to be overridden with a __context__
variable.
 2015-02-10 15:06:43 -06:00
Erik Johnson
d1b5e630da Correct incorrect info in docstring 2015-02-10 15:06:43 -06:00
Erik Johnson
59d1754844 Make arguments vertical for easier reading 2015-02-10 15:06:43 -06:00
Erik Johnson
aaaf2d64b5 Lint fixes + fix bad config entry name 2015-02-10 15:06:43 -06:00
Erik Johnson
e20044026a LXC re-factor (WIP) 2015-02-10 15:06:43 -06:00
Erik Johnson
49d95ec08c Allow interface dict to be passed to salt.utils.network.ip_addrs{,6} 
This will allow the lxc.info function leverage existing logic rather
than trying to parse ip/ifconfig output by itself.
 2015-02-10 15:06:43 -06:00
Erik Johnson
b4cf28c2c6 Properly set lxc.utsname and /etc/hostname 2015-02-10 15:06:43 -06:00
Thomas S Hatch
8734d6f8cc Merge pull request #20554 from Unity-Technologies/unzip-symlink 
Fixed the extraction of symbolic links from zip archives
 2015-02-10 10:18:14 -07:00
Thomas S Hatch
630d03b4b3 Merge pull request #20447 from jacksontj/2015.2 
2015.2: backport overhaul of LazyLoader from #20274
 2015-02-10 09:46:53 -07:00
Erik Johnson
85a689ed63 Merge pull request #20550 from kim0/freebsd-pkg-upgrade-single-pkg 
Add support for upgrading named packages on FreeBSD pkgng
 2015-02-10 10:38:34 -06:00
Daniel Hobley
e3e9f20510 Pylint 2015-02-10 17:04:57 +01:00
Daniel Hobley
f893029b84 Fixed the extraction of symbolic links from zip archives 2015-02-10 16:26:39 +01:00
Ahmed Kamal
dfeaa19b0e Linter happiness 2015-02-10 04:54:17 +02:00
Ahmed Kamal
aa5ae496e0 Add support for upgrading named packages on FreeBSD pkgng 2015-02-10 04:38:20 +02:00
Nicole Thomas
3e2e9e3861 Merge pull request #20532 from rallytime/bp-20501 
Backport #20501 to 2015.2
 2015-02-09 17:10:30 -07:00
Nicole Thomas
525f00cb44 Merge pull request #20529 from basepi/merge-forward-2015.2 
Merge forward from 2014.7 to 2015.2
 2015-02-09 17:09:57 -07:00
Daniel Wallace
7d70cd19c4 add note about rackconnectv3 variable 2015-02-09 16:12:33 -07:00
Daniel Wallace
bbab6235e0 fix rackconnect v3 implementation 2015-02-09 16:12:33 -07:00
Colton Myers
eba17606b4 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 2015-02-09 15:37:25 -07:00
jfindlay
9246f64f9b Merge pull request #20523 from terminalmage/fix-kwarg-parsing 
Fix regression in arg parsing
 2015-02-09 12:55:22 -07:00
Erik Johnson
ebf9a9b9d6 Fix regression in arg parsing 
This keeps kwargs with newlines in them from being misidentifed as
positional rather than keyword arguments.
 2015-02-09 12:36:21 -06:00
Erik Johnson
3e321fdb48 Add file-locking bugfix to 2014.7.2 release notes 2015-02-09 11:32:20 -06:00
Erik Johnson
e97d4635cd Merge branch 'crasu-2014.7' into 2014.7 2015-02-09 09:52:39 -06:00
Christian Kraemer
56653cbfd5 Added closing of filehandle and removal of gitfs update.lk 2015-02-09 09:52:26 -06:00
Christian Kraemer
083b39e467 #18839 more linter fixes 2015-02-09 09:51:18 -06:00
Christian Kraemer
477d6d5d74 #18839 more linter fixes 2015-02-09 09:51:18 -06:00
Christian Kraemer
25da94c174 #18839 more linter fixes 2015-02-09 09:51:18 -06:00
Christian Kraemer
f28a5f164b #18839 linter fixes 2015-02-09 09:51:18 -06:00
Christian Kraemer
434224ba0d Fix file locking for gits fs see #18839 2015-02-09 09:51:18 -06:00
jfindlay
f9e1e43ec9 Merge pull request #20510 from eliasp/2014.7-issue-18689 
Fix #18689 by handling psutil exceptions.
 2015-02-09 08:11:12 -07:00
Elias Probst
35baba9e54 Fix #18689 by handling psutil exceptions. 
The information of some processes can't be accessed on Windows when
they're run under the 'LOCAL SERVICE' account.
This caused exceptions which bubbled up into `ps.pgrep` and caused
there backtraces as described in #18689.
 2015-02-09 16:06:59 +01:00
Thomas Jackson
f4abce1d24 Add six import to loader 2015-02-07 14:55:31 -08:00
Thomas Jackson
640aff6378 Fix mis-naming from pylint cleanup 2015-02-07 14:55:30 -08:00
Thomas Jackson
438ede78ba Support arbitrarily deep modules 
Note: salt can still only *call* modules on the first depth, but they can then import anything below
 2015-02-07 14:55:30 -08:00
Thomas Jackson
249096c292 Change modulekey for submodule test-- to avoid namespace collisions 2015-02-07 12:02:26 -08:00
Thomas Jackson
7605ba60a8 pylint 2015-02-07 12:02:26 -08:00
Thomas Jackson
ca5eac3936 Add support for submodules to LazyLoader 
This was a feature that was inadvertently removed in #20274, but since it was undocumented and untested no one noticed. Thanks to @steverweber for pointing it out.

This includes the feature as well as tests.
 2015-02-07 12:02:26 -08:00
Thomas Jackson
725708a04b Correct tag name in loader tests 2015-02-07 12:02:23 -08:00
Thomas Jackson
bb89068010 Add "disabled" support 
this allows you to "blacklist" modules.

Addition to #20274

Conflicts:
	salt/loader.py
 2015-02-07 12:02:03 -08:00
rallytime
15a140ece4 Moved tests/unit/loader.py to tests/integration/loader/loader.py 
These are integration tests and not unit tests, so they should be
in the proper directory.

Also, fixed up the python 3 incompatability pylint errors.
 2015-02-07 11:59:47 -08:00