Erik Johnson
0f2bc036d4
Split out _run() func into container_resource.py
...
This is in preparation for nspawn re-using this same code in a future
release.
2015-02-28 10:29:22 -06:00
Erik Johnson
5b83b5e9a4
Add salt.modules.container_resource
2015-02-28 10:29:21 -06:00
Nicole Thomas
6eded8fb43
Merge pull request #21152 from s0undt3ch/2015.2
...
[2015.2] Update bootstrap script to latest stable, v2015.02.28
2015-02-28 09:05:00 -07:00
Pedro Algarvio
a01a3c29c8
Update bootstrap script to latest stable, v2015.02.28
...
* Fix Debian backports repository.
2015-02-28 15:11:21 +00:00
Erik Johnson
5cc7b61d8a
Merge pull request #21147 from terminalmage/rename-lxc-cmd-funcs
...
Rename new lxc.cmd_run*, lxc.cmd_retcode functions
2015-02-28 00:11:12 -06:00
Erik Johnson
c734a7db18
Update LXC tutorial to reflect function name change
2015-02-27 23:10:22 -06:00
Erik Johnson
694a4678aa
Rename new lxc.cmd_run*, lxc.cmd_retcode functions
...
These are often typo'ed due to their resemblance to cmd.run,
cmd.run_stdout, etc. This commit renames them, removing the "cmd_" and
making them lxc.run, lxc.run_stdout, etc.
Now's the time to do this since these functions have not yet seen an
official release.
2015-02-27 23:10:22 -06:00
C. R. Oldham
c24834291b
Merge pull request #21136 from cro/2015-02-27mergeforward1
...
Merge forward from 2014.7 to 2015.2.
2015-02-27 21:55:29 -07:00
C. R. Oldham
1ff3192c20
Fileserver lists return lists
2015-02-27 17:24:25 -07:00
Aditya Kulkarni
d4c3bbf166
Merge pull request #21139 from pass-by-value/update_config_wheel
...
Add wheel function to update master config
2015-02-27 16:48:46 -07:00
jfindlay
02d3b3e64c
Merge pull request #21135 from cro/ugly_pyrax_error2
...
Import salt.utils.openstack.pyrax differently to avoid failed import by loader
2015-02-27 16:22:32 -07:00
jfindlay
3f415683e9
Merge pull request #21080 from freimer/private_key_fix
...
Private key fix
2015-02-27 16:21:53 -07:00
Aditya Kulkarni
1f1bb2954f
Add wheel function to update master config
2015-02-27 15:59:14 -07:00
C. R. Oldham
3034c343ba
Fixup a few merge conflict problems & pylint
2015-02-27 15:26:51 -07:00
Fred Reimer
7976f5a694
Added pylink disable W0611
2015-02-27 17:23:35 -05:00
C. R. Oldham
c9610bc4f2
Merge commit, merge forward 2014.7 to 2015.2
2015-02-27 15:01:30 -07:00
jond64
f8bde515fd
Fix for #21039
2015-02-27 14:54:00 -07:00
Erik Johnson
12e37a391e
add missing import
2015-02-27 14:54:00 -07:00
Erik Johnson
6bfa45c6d4
add argument explanation to docstring
2015-02-27 14:53:59 -07:00
Robert Fach
6395e91de4
fixed invalid changes data issue
2015-02-27 14:53:59 -07:00
Robert Fach
23e48fbcbf
fixed identation
2015-02-27 14:53:59 -07:00
Robert Fach
e8eb6fe6ff
fixed issue where user option is internally transformed to username which is what /proc/mounts reports for cifs mounts
2015-02-27 14:53:59 -07:00
Robert Fach
983d615d5e
added options auto, users to mount invisible options
2015-02-27 14:53:59 -07:00
Erik Johnson
b23a8788c1
Add imp to windows freezer_includes
...
Got an ImportError on this line when I was testing on Windows.
https://github.com/terminalmage/salt/blob/43e15d8/salt/loader.py#L624
2015-02-27 14:53:59 -07:00
Loren Gordon
f3014b5b33
Convert pattern to string, fixes saltstack#21051
2015-02-27 14:53:59 -07:00
Erik Johnson
f7532697a0
Support Chocolatey 0.9.9+
...
The upcoming release will require "--yes" to execute commands that
change the machine's state (install/remove packages, etc). Also, our old
version determination code won't work with it. This commit fixes both
issues.
2015-02-27 14:53:59 -07:00
Justin Findlay
e743675219
simplify yaml parsing for publish module
...
updates #20992
2015-02-27 14:53:59 -07:00
Erik Johnson
be8c392471
Catch FileserverConfigError exceptions on master startup
...
This causes the master to fail to start when there are fileserver config
issues, leading people quicker to the log to investigate, where they
will find a meaningful error message. This should it much quicker and
easier for users to realize there are gitfs/hgfs/svnfs fileserver config
problems.
Fixes #21021 .
2015-02-27 14:53:59 -07:00
Erik Johnson
bf38fbb5ca
svnfs: Raise exceptions on invalid configuration
2015-02-27 14:53:59 -07:00
Erik Johnson
f062563cac
hg: Raise exceptions on invalid configuration
2015-02-27 14:53:59 -07:00
Erik Johnson
eb17e309ae
gitfs: Raise exceptions on invalid configuration
2015-02-27 14:53:59 -07:00
rallytime
b01196e7e8
Add transport key to mocked opts to fix batch unit tests
2015-02-27 14:53:58 -07:00
Erik Johnson
6563bb80e3
Fix missing space in log message
2015-02-27 14:53:58 -07:00
Colton Myers
f5325dcfea
Fix for salt-ssh without command line parsers
2015-02-27 14:53:58 -07:00
Erik Johnson
0b1401174a
Add FileserverConfigError exception class
2015-02-27 14:53:58 -07:00
rallytime
ec20b2c4ba
Pylint fix
2015-02-27 14:53:58 -07:00
Paul Tonelli
362e8c5ce0
use file.replace instead of file.sed
2015-02-27 14:53:58 -07:00
Paul Tonelli
123daf3090
fix set_locale when locale file does not exist (in RedHat family)
2015-02-27 14:53:58 -07:00
rallytime
4248bbfa2e
Use LooseVersion instead of StrictVersion to use an RC version of MongoDB
...
Fixes #21012
2015-02-27 14:53:58 -07:00
Mike Place
14592ed1f9
Adjust batch test
2015-02-27 14:53:58 -07:00
Mike Place
6c5f3f8d2e
Just use ckminions in batch mode.
...
Refs #18358
2015-02-27 14:53:58 -07:00
Tom Nitti
d8e3573126
correctly count raid devices when creating an array with spares
2015-02-27 14:53:58 -07:00
Warren Turkal
5f7f335efe
Add version to a deprecation log message.
2015-02-27 14:53:58 -07:00
Erik Johnson
341b6622c8
gitfs: Add warning about ssh:// URLs (dulwich)
2015-02-27 14:53:57 -07:00
Erik Johnson
7ed9c66b02
gitfs: Support ssh:// URLs for dulwich
2015-02-27 14:53:57 -07:00
Erik Johnson
cc248c2d51
fix missing import
2015-02-27 14:53:57 -07:00
Erik Johnson
fbb93258eb
Fix CLI example for fileserver.clear_cache runner
2015-02-27 14:53:57 -07:00
Erik Johnson
e3ebeddfa1
Lint fixes
2015-02-27 14:53:57 -07:00
Erik Johnson
3cd4c5d0aa
Fix spurious error in master log
...
When only GitPython is installed, and no gitfs_provider is set, an error
about pygit2 not being available is logged. This should not happen, as
gitfs should just select the first available out of pygit2, gitpython,
and dulwich.
This fixes #17945 by suppressing the error.
2015-02-27 14:53:57 -07:00
Erik Johnson
05e39004d1
Log success/failure in dealing with lockfiles in their actual functions
...
Logging them separately in update() doesn't make much sense.
2015-02-27 14:53:57 -07:00
