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
13,578 Commits 24 Branches 182 Tags 341 MiB
e6565b50a3
Commit Graph

13578 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas S Hatch
e6565b50a3 Fix bug in minion_publish repair 2013-05-25 02:43:36 -06:00
Seth House
fa80a92540 Merge pull request #5256 from basepi/yamlargs5224 
Parse kwargs with YAML, Fix #5224
 2013-05-24 17:13:11 -07:00
Colton Myers
d00a89afd4 Parse kwargs with YAML, Fix #5224 2013-05-24 16:24:45 -06:00
Thomas S Hatch
09557fb62f Merge pull request #5253 from basepi/gitfs5007 
Allow slashes in gitfs envs, Fix #5007
 2013-05-24 15:07:41 -07:00
David Boucha
665965f0e8 Merge pull request #5252 from kvbik/disabling-upstart-job 
be consistent about .override use
 2013-05-24 14:28:04 -07:00
Colton Myers
205f103a09 Add new ref logic to _get_ref as well 2013-05-24 14:21:45 -06:00
Jakub Vysoky
cb2cf2ca8e be consistent about .override use 
disabling of service is correct, but checking whether
it is disabled is not

upstart service is disabled by creating {service-name}.override file
and adding a 'manual' stanza there [1]

[1] http://upstart.ubuntu.com/cookbook/#disabling-a-job-from-automatically-starting
 2013-05-24 22:13:16 +02:00
David Boucha
18732864d3 Merge pull request #5251 from UtahDave/new_win_network 
Add docstring to interface()
 2013-05-24 12:58:04 -07:00
David Boucha
9e08886ac8 Add docstring to interface() 2013-05-24 13:51:00 -06:00
Colton Myers
0419596680 Allow slashes in gitfs envs, Fix #5007 2013-05-24 13:44:25 -06:00
David Boucha
0db1eb70ca Merge pull request #5244 from valentinbud/develop 
Update GitFS Backend Walkthrough to include GitFS over SSH
 2013-05-24 10:19:02 -07:00
David Boucha
d3f814e08a Merge pull request #5247 from terminalmage/issue5209 
Make pkg.install respect __env__
 2013-05-24 10:18:35 -07:00
Seth House
5cee93a483 Merge pull request #5248 from virtua-network/smartos_vmadm 
Add 'vmadm' module which provides 'virt' for SmartOS
 2013-05-24 09:59:55 -07:00
mguegan
b721426cf9 Add 'vmadm' module which provides 'virt' for SmartOS 
First commit of 'smartos_vmadm', a module that uses the 'vmadm'
command on SmartOS CN. For the moment very few functions are present
but I'm pretty sure that more will come in a couple of days.

Implemented :

* list_vms()

* list_active_vms()

* list_inactive_vms()

* shutdown(uuid)

* start(uuid)

* reboot(uuid)
 2013-05-24 18:41:37 +02:00
Erik Johnson
0fac18fc50 Make pkg.install respect __env__ 
This fixes #5209.
 2013-05-24 10:44:11 -05:00
Thomas S Hatch
469c59dc05 Merge pull request #5242 from Learnosity/iface_grain 
Added the 'ip_interfaces' grain
 2013-05-24 01:54:02 -07:00
Thomas S Hatch
55e7211e91 Merge pull request #5236 from cvrebert/patch-2 
pkg state: fix pylint W0604
 2013-05-24 01:52:39 -07:00
Thomas S Hatch
4b02d26f4d Merge pull request #5229 from hulu/use-raw-strings-for-regexes-dammit 
fix new pylint W1401 (Anomalous backslash in string) instances
 2013-05-24 01:51:38 -07:00
Thomas S Hatch
97a75645b8 Merge pull request #5201 from rballestrini-cars/develop 
Resolve bug where states/cmd.py _run_check() function was mutating cmd_k...
 2013-05-24 01:38:49 -07:00
Thomas S Hatch
c3976664d8 Merge pull request #5198 from faust/makeconf-features 
added functions for FEATURES variable
 2013-05-24 01:34:06 -07:00
Valentin Bud
f9e74255d2 Update GitFS Backend Walkthrough to include GitFS over SSH 
A small description on how to configure GitFS over SSH transport.
 2013-05-24 10:36:56 +03:00
Thomas S Hatch
20732ae021 Merge pull request #5197 from faust/eix-ask-no 
added "--ask n" to eix-sync (see #5148)
 2013-05-23 23:28:41 -07:00
Thomas S Hatch
a22b605f1c Merge pull request #5187 from geoffgarside/freebsd-mount 
Fix salt.modules.mount for FreeBSD
 2013-05-23 21:35:30 -07:00
Alan Garfield
844ba9c27a Added the 'ip_interfaces' grain 
This grain returns a dict of the interfaces and their ip address which
is handy when you want to build a config file with a specfic known
interface. The current 'ipv4' grain is useless for this.
 2013-05-24 10:54:03 +10:00
David Boucha
bc7088747a Merge pull request #5240 from basepi/jinjaerrors4966 
Add line number to Jinja errors, Fix #4966
 2013-05-23 15:40:13 -07:00
Colton Myers
695dc745d4 Clean up the error message 2013-05-23 16:33:21 -06:00
Colton Myers
3567506c2d Add line number to Jinja errors, Fix #4966 
Thanks to @Mrten to figuring this one out.  =)
 2013-05-23 16:24:59 -06:00
David Boucha
225b2d8c0f Merge pull request #5239 from UtahDave/develop 
Don't use a bare exception
 2013-05-23 15:14:38 -07:00
David Boucha
b3dda6e107 Don't use a bare exception 2013-05-23 16:14:00 -06:00
David Boucha
49f709e22b Merge pull request #5233 from cvrebert/patch-6 
bridge module: avoid bare `except:`
 2013-05-23 15:07:56 -07:00
David Boucha
20c5832f65 Merge pull request #5230 from hulu/xapi 
Various pylint fixes to the xapi module
 2013-05-23 15:06:28 -07:00
David Boucha
94cafc557c Merge pull request #5232 from cvrebert/patch-5 
zfs module: rm unused import of the `os` std lib module
 2013-05-23 15:05:40 -07:00
Joseph Hall
faeecd2138 Merge pull request #5238 from virtua-network/zpool_module 
Zpool module
 2013-05-23 14:53:13 -07:00
mguegan
eb41d6ddd0 modules/zpool : add scrub function 
Begin a scrub on selected zpool
 2013-05-23 23:44:22 +02:00
Chris Rebert
5e72a30af2 pkg state: fix pylint W0604 
************* Module salt.states.pkg
W0604: 48,4: Using the global statement at the module level
 2013-05-23 14:22:47 -06:00
Chris Rebert
b6a45a7a2d bridge module: avoid bare except: 
************* Module salt.modules.bridge
W0702:287,12:find_interfaces: No exception type(s) specified
 2013-05-23 14:10:54 -06:00
Chris Rebert
13fce3b539 zfs module: rm unused import of the os std lib module 2013-05-23 14:09:20 -06:00
Chris Rebert
fe216a4f77 Various pylint fixes to the xapi module 
************* Module salt.modules.xapi
E0602: 58,14:_get_xapi_session: Undefined variable 'CommandExecutionError'
W0702: [many instances]: No exception type(s) specified
 2013-05-23 13:02:18 -07:00
Chris Rebert
84dd90054a fix new pylint W1401 (Anomalous backslash in string) instances 2013-05-23 12:40:59 -07:00
David Boucha
4ebbc336c5 Merge pull request #5228 from cvrebert/patch-4 
bridge mod: add spaces after commas
 2013-05-23 12:36:52 -07:00
Chris Rebert
f36661cc2a bridge mod: add spaces after commas 
************* Module salt.modules.bridge
C0324:211,4:_os_dispatch: Comma not followed by a space
 2013-05-23 13:31:54 -06:00
David Boucha
ccfd8da690 Merge pull request #5227 from cvrebert/patch-3 
xapi mod: add comma after space
 2013-05-23 12:31:10 -07:00
Chris Rebert
e7c08f9154 xapi mod: add comma after space 
************* Module salt.modules.xapi
C0324:722,16:vm_netstats._info: Comma not followed by a space
                ret[vif_rec['device']] = _get_metrics_record(xapi,'VIF',
                                                                 ^^
                                                            vif_rec)
 2013-05-23 13:30:08 -06:00
David Boucha
38a00bc72a Merge pull request #5226 from cvrebert/patch-2 
cmd state: add space after comma
 2013-05-23 12:29:54 -07:00
David Boucha
654fe9e591 Merge pull request #5225 from cvrebert/patch-1 
client.py: fix punctuation typo
 2013-05-23 12:29:20 -07:00
Chris Rebert
ed37f13709 cmd state: add space after comma 
************* Module salt.states.cmd
C0324:616,8:script: Comma not followed by a space
        cmd_kwargs.update({'args': name.split(' ',1)[1]})
                                                 ^^
 2013-05-23 13:25:32 -06:00
mguegan
ed4b06eba5 modules/zpool : add iostat function 
Displays I/O statistics for the given pools
 2013-05-23 21:25:25 +02:00
Chris Rebert
822e780d0b client.py: fix punctuation typo 2013-05-23 13:20:26 -06:00
Colton Myers
c3c767a6ac Merge pull request #5223 from UtahDave/fix_broadcast 
Don't fail if the broadcast field is empty
 2013-05-23 11:41:10 -07:00
David Boucha
85f6863cef Merge pull request #5222 from basepi/stateoptimization 
Remove redundant fnmatch call
 2013-05-23 11:39:38 -07:00