Commit Graph

15197 Commits

Author SHA1 Message Date
Chris Rebert
caa0fdd6be Error on completely invalid kwd args; follow-up to #6093 2013-07-11 13:44:09 -07: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
sedie-photobucket
0e9db41ea3 Merge pull request #1 from terminalmage/rh_service-refactor
Don't disable service added with chkconfig --add
2013-07-10 15:36:05 -07:00
Thomas S Hatch
3f08d2f7af Merge pull request #6067 from mgwilliams/ddns
OMAPI Module
2013-07-10 15:35:19 -07:00
David Boucha
a014e5fc51 Merge pull request #6094 from techhat/iptables
Adding basic iptables state with append function
2013-07-10 14:21:35 -07:00
Joseph Hall
ae9ec0184c Adding basic iptables state with append function 2013-07-10 14:58:35 -06:00
Matthew Williams
2bbe76d793 omapi: add support for key auth; improve functionality 2013-07-10 20:46:24 +00:00
Joseph Hall
6db22d6513 Have the iptables execution module compensate for a dict coming from the iptables state 2013-07-10 14:45:37 -06:00
Erik Johnson
3480d65752 Don't disable service added with chkconfig --add
chkconfig uses comments at the top of the initscript to decide which
runlevel to enable/disable the service. Don't disable by default, as it
stomps on normal chkconfig behavior.
2013-07-10 15:14:45 -05:00
Joseph Hall
5450e721c6 Add build_rule function to iptables execution module 2013-07-10 14:11:30 -06:00
Joseph Hall
da612b59b1 Add function to check for the existance of an iptables rule 2013-07-10 13:25:57 -06:00
Joseph Hall
a8127c4ae1 Merge pull request #6093 from terminalmage/issue6070
Cleanup unused arguments
2013-07-10 12:14:10 -07:00
Erik Johnson
e0bf5309c6 Cleanup unused arguments
This commit cleans up some unused arguments in user and group
management, storing them in **kwargs. Warnings are logged when the
arguments are used. Fixes #6070.
2013-07-10 14:08:21 -05:00
David Boucha
500d1d8b73 Merge pull request #6092 from UtahDave/develop
Clarify that event is sent up to the master
2013-07-10 11:55:22 -07:00
David Boucha
89f8d0ebe0 Clarify that event is sent up to the master 2013-07-10 12:53:50 -06:00
Joseph Hall
73e08f792c Merge pull request #6091 from terminalmage/issue6085
Allow user to set password to default hash
2013-07-10 11:22:48 -07:00
Erik Johnson
875e25231d Rename 'pwd' field in windows shadow.info output
This makes the field name consistent with the other shadow modules. Note
that the passwd field is not used at all in Windows user management, so
this is merely a cosmetic change.
2013-07-10 13:12:29 -05:00
Erik Johnson
6b177ebac7 docstring grammar fix 2013-07-10 13:12:21 -05:00
Erik Johnson
b948f028b3 Allow user to set password to default hash
The passwd field in the output from shadow.info was normalized in
508d816 and 6239136 to make it easier for states to manage users, but
this prevents users from setting the password to the default password
hash. This commit fixes that regression.
2013-07-10 13:12:11 -05:00