Commit Graph

15224 Commits

Author SHA1 Message Date
Thomas S Hatch
7e90cb0f1e Merge pull request #6123 from unicolet/pullrequests/returners/sentry
improve the sentry returner so that successful executions are also sent ...
2013-07-12 10:50:38 -07:00
Thomas S Hatch
6a86d25701 Merge pull request #6072 from cvrebert/patch-1
SaltLoggingClass: Pass __init__ args thru to superclass' __new__
2013-07-12 10:31:06 -07:00
Thomas S Hatch
46700b2e6c Merge pull request #6039 from johnnoone/config-extension
Serialize dataset into file states and jinja templates
2013-07-12 10:28:47 -07:00
Thomas S Hatch
3a90844fe5 Merge branch 'patch-2' of git://github.com/extesy/salt into extesy-patch-2
Conflicts:
	salt/modules/pip.py
2013-07-12 11:19:38 -06:00
Thomas S Hatch
5fa897ed9c Merge pull request #6034 from extesy/patch-1
Enhance virtualenv module to install distribute/pip
2013-07-12 10:21:09 -07:00
Umberto Nicoletti
2256fc9a44 improve the sentry returner so that successful executions are also sent to sentry. Also provide more configuration options for tagging messages in the sentry UI 2013-07-12 09:40:39 +02:00
Joseph Hall
1149a1b51f Merge pull request #6121 from kylegato/patch-1
Added logic to failback to python os.getloadavg if procfs does not exist
2013-07-11 20:44:21 -07:00
Joseph Hall
1bf40a8f74 Merge pull request #6119 from terminalmage/quickfix
Change behavior of apt._clean_pkglist
2013-07-11 20:37:11 -07:00
David Boucha
c9d682712d Merge pull request #6120 from terminalmage/issue6116
import _binary_replace for win_file.py
2013-07-11 19:19:55 -07:00
David Boucha
94da208d83 Merge pull request #6122 from herlo/develop
Fedora/EPEL RPM spec file for feature release 0.16.0
2013-07-11 16:50:14 -07:00
Clint Savage
a1729fb373 updating spec file to feature release 0.16.0 2013-07-11 17:13:00 -06:00
Kyle Gato
10adff8c7b Added logic to failback to python os.getloadavg if procfs does not exist, such as in FreeBSD for load averages 2013-07-11 16:08:45 -07:00
Erik Johnson
1dccb1e8e8 import _binary_replace for win_file.py
Windows file management re-uses a lot of functions from
salt.modules.file, and a new function added in b93c724, which is needed
in check_file_meta(), was not added to the functions that are imported
into win_file.py. Fixes #6116.
2013-07-11 17:54:17 -05:00
Erik Johnson
daf5aa7284 Change behavior of apt._clean_pkglist
The current behavior of this function will remove all instances of '1'
from the version list for a package. If the list only contains multiple
instances of '1', this will clear the list though, and that's not what
is wanted. The intention I had for this function when I wrote it was to
strip all virtual package markers if that package is both a real package
and virtual package, but also to take instances where more than one
target of a virtual package is installed, and make it so that only one
instance of '1' is in the version list for that package. This commit
adjusts the behavior to work that way.
2013-07-11 17:31:26 -05:00
Joseph Hall
6545fd96b2 Merge pull request #6115 from hulu/extra-kwargs-err-check
Error on completely invalid kwd args; follow-up to #6093
2013-07-11 13:49:20 -07:00
Chris Rebert
caa0fdd6be Error on completely invalid kwd args; follow-up to #6093 2013-07-11 13:44:09 -07:00
Joseph Hall
4f16422657 Merge pull request #6112 from mgwilliams/ddns
ddns: add add_host and delete_host functions
2013-07-11 13:37:09 -07:00
Matthew Williams
f527c02b08 ddns: add add_host and delete_host functions 2013-07-11 20:34:08 +00:00
Joseph Hall
0b4a53f50a Merge pull request #6111 from cvrebert/patch-6
states/service.py: rm unused import of `sys`
2013-07-11 12:43:32 -07:00
Joseph Hall
e40179d7cf Merge pull request #6110 from cvrebert/patch-5
states.mount: fix typos; want assignment, not equality
2013-07-11 12:43:11 -07:00
Joseph Hall
a5c621d172 Merge pull request #6109 from hulu/group-modules-fixes
solaris_group, pw_group: add missing imports and logger creations
2013-07-11 12:42:38 -07:00
Joseph Hall
805677e5ba Merge pull request #6106 from cvrebert/patch-2
salt/modules/omapi.py: rm unused imports
2013-07-11 12:42:08 -07:00
Joseph Hall
dd8e22060b Merge pull request #6108 from cvrebert/patch-4
modules/iptables.py: fix pylint W1401 (Anomalous backslash in string)
2013-07-11 12:41:44 -07:00
Joseph Hall
07880fb98e Merge pull request #6107 from cvrebert/patch-3
states/iptables.py: rm unused imports
2013-07-11 12:40:32 -07:00
Chris Rebert
77529d620c states/service.py: rm unused import of sys
************* Module salt.states.service
W0611: 39,0: Unused import sys
2013-07-11 12:39:52 -07:00
Chris Rebert
53765e2889 states.mount: fix typos; want assignment, not equality 2013-07-11 12:37:08 -07:00
Chris Rebert
b5ef4dac62 solaris_group, pw_group: add missing imports and logger creations 2013-07-11 12:33:43 -07:00
Chris Rebert
06ae37d56f modules/iptables.py: fix pylint W1401 (Anomalous backslash in string) 2013-07-11 12:27:27 -07:00
Chris Rebert
f643643a70 states/iptables.py: rm unused imports
************* Module salt.states.iptables
W0611: 23,0: Unused import sys
W0611: 24,0: Unused import pprint
2013-07-11 12:23:02 -07:00
Chris Rebert
d04a36d99c salt/modules/omapi.py: rm unused imports
************* Module salt.modules.omapi
W0611: 16,0: Unused import base64
W0611: 19,0: Unused import salt
2013-07-11 12:21:20 -07:00
Joseph Hall
1daf5e999d Merge pull request #6104 from terminalmage/quickfix
remove _pkgname_without_arch (and refs)
2013-07-11 11:23:10 -07:00
Erik Johnson
b0e8f43647 remove _pkgname_without_arch (and refs)
This function is old code that is unneeded due to changes in how salt
manages packages. It also represents a bug in which trying to use a
pkg.removed state using the pkgname:i386 format used by apt for 32-bit
packages on 64-bit systems always fails, because the package is
identified as pkgname, not pkgname:i386.  Additionally, using just
"pkgname" in your pkg.removed state would fail, because running "apt-get
remove pkgname" would fail for pkgname:i386.
2013-07-11 13:04:38 -05:00
Thomas S Hatch
3c151112c8 Merge pull request #6103 from terminalmage/quickfix
Refresh modules for certain file.symlink states
2013-07-11 09:43:46 -07:00
Erik Johnson
69f38b756e Refresh modules for certain file.symlink states
This commit refreshes modules when there are changes in a file.symlink
state with 'bin' in the name. Making this distinction keeps refreshes
from being done for all symlinks, reducing the amount of overhead this
change would introduce. A symlink with 'bin' in the name is likely to
change the available commands on the minion, and thus might make
available certain states/modules which rely on the existence of a given
command in the user's PATH. Without a refresh, these states/module
function calls would fail despite the needed shell command technically
being available.
2013-07-11 11:20:38 -05:00
Thomas S Hatch
f5eb011000 Update module refresh in state runs to use new event means to signal
the minion daemon that modules need to be refreshed
2013-07-11 09:48:24 -06:00
Thomas S Hatch
75b49bc3b1 Only load if powerpath is installed
Salt dynamically reloads modules durring highstate calls to ensure that
the highstate does not need to be run twice. If this behavior is not
being seen then this is a bug of the highstate run is not tracking the
software insalation of powerpath correctly and needs to be extended
2013-07-11 09:24:16 -06:00
Thomas S Hatch
4fe704e1f1 Merge pull request #6099 from tweeklab/powerpath_state
Start powerpath support module and state
2013-07-11 08:10:47 -07:00
Joseph Hall
741b0f45bb Merge pull request #6098 from mgwilliams/virt
virt.init: add option to control whether the new VM is started
2013-07-11 07:13:41 -07:00
Pedro Algarvio
63a4c26393 Merge pull request #6101 from terminalmage/issue6090
Fix regression in apt.py
2013-07-11 06:46:01 -07:00
Erik Johnson
6bea2b10d7 rsplit, not split! 2013-07-11 00:12:04 -05:00
Erik Johnson
b70c05ffcb Prevent future parsing issues from crippling apt.list_pkgs
This causes _pkgname_without_arch() to Log an error and return the
passed pkg name if the stripped version ends up being an empty string.
2013-07-10 23:44:38 -05:00
Erik Johnson
d0b3859762 Fix regression in apt.py
This fixes a regression introduced in a43a2af a few days ago.
2013-07-10 23:38:05 -05:00
Phil D'Amore
98687fd6eb Add powerpath module 2013-07-10 22:57:35 -04:00
Matthew Williams
2a058f3a16 virt.init: add option to control whether the new VM is started 2013-07-11 02:07:13 +00:00
Thomas S Hatch
e79c2b613e Merge pull request #6096 from terminalmage/quickfix
Remove references to __context__['service.all']
2013-07-10 16:14:30 -07:00
Erik Johnson
d5e2dc3ccd Remove references to __context__['service.all']
Now that rh_service.py has been refactored in such a way that chkconfig
is needed less, module context is not used. Therefore, the logic that
clears out this variable is now unnecessary.
2013-07-10 18:09:18 -05:00
Erik Johnson
fc3f29e9cd Merge pull request #6075 from sedie-photobucket/develop
re-factor rh_service.py
2013-07-10 15:56:19 -07:00
Joseph Hall
d5d4778b3d Merge pull request #6095 from terminalmage/quickfix
Change "empty_password" to "default_hash"
2013-07-10 15:51:40 -07:00
Erik Johnson
dbdc4ca90d Change "empty_password" to "default_hash"
Since the function doesn't really return an empty password, but rather
the default hash, this change makes the naming more accurate, especially
since this function is exposed to the user.
2013-07-10 17:49:07 -05:00
Thomas S Hatch
1b72c517f2 Merge pull request #6040 from felskrone/add_reauth_delay
Add reauth delay
2013-07-10 15:38:47 -07:00