Thomas S Hatch
2265eeb3b7
Revert "Use yamlify_arg() in more places"
...
This reverts commit 663176ac87
.
2013-05-28 23:44:42 -06:00
Thomas S Hatch
03e47c1127
Merge pull request #5294 from yinchuan/develop
...
Node Groups: 'L@foo.domain.com ,bar.domain.com,baz.domain.com or bl*.doma...
2013-05-28 21:03:14 -07:00
yinchuan
b80f904853
Node Groups: 'L@foo.domain.com,bar.domain.com,baz.domain.com or bl*.domain.com' not 'and'
...
use 'and' at this confuse me, and in the http://docs.saltstack.com/topics/targeting/nodegroups.html also use 'or'.
2013-05-29 11:08:32 +08:00
Thomas S Hatch
a1b95866de
Merge pull request #5293 from hulu/docs
...
remove deleted modules from docs
2013-05-28 17:36:36 -07:00
Chris Rebert
cde16f8608
remove deleted modules from docs
2013-05-28 17:24:12 -07:00
Thomas S Hatch
c0605b7f1c
Merge pull request #5291 from cvrebert/patch-1
...
network mod: "not X in Y" => "X not in Y"
2013-05-28 16:16:04 -07:00
Chris Rebert
634e441dcd
network mod: "not X in Y" => "X not in Y"
2013-05-28 17:13:59 -06:00
Thomas S Hatch
1b1e6040af
Merge pull request #5290 from basepi/fileseddoc
...
Add example for no backup to file.sed state, Fix #5202
2013-05-28 15:51:10 -07:00
Thomas S Hatch
906c0b027d
Merge pull request #5289 from basepi/gitlatest5237
...
Remove git.latest kwargs, unused, Fix #5237
2013-05-28 15:49:56 -07:00
Colton Myers
f998ea6645
Add example for no backup to file.sed state, Fix #5202
2013-05-28 16:47:25 -06:00
Thomas S Hatch
37840b07db
deprecate butterkvm, this is long not supported
2013-05-28 16:38:07 -06:00
Thomas S Hatch
94b82106ac
Deprecate kvm_hyper in favor of virt
2013-05-28 16:37:40 -06:00
Colton Myers
621717861f
Remove git.latest kwargs, unused, Fix #5237
2013-05-28 16:35:44 -06:00
Thomas S Hatch
e80d2e2c4e
Merge pull request #5287 from virtua-network/vmadm
...
modules/smartos_vmadm : add init(**kwargs)
2013-05-28 14:49:57 -07:00
mguegan
8012d2672d
modules/smartos_vmadm : add init(**kwargs)
...
We can now create (and launch) a Zone (OS virt) by passing correct
arguments/values to the virt.init function.
Example :
salt * virt.init \
image_uuid='9eac5c0c-a941-11e2-a7dc-57a6b041988f' \
alias='test' \
hostname='www.domain.com' quota=2 max_physical_memory=256 \
nic_tag='admin' ip='192.168.0.95' netmask='255.255.255.0' \
gateway='192.168.20.1'
2013-05-28 23:33:27 +02:00
Thomas S Hatch
ab9fbc94e7
Single quotes
2013-05-28 15:09:40 -06:00
Joseph Hall
6f2880d609
Merge pull request #5286 from UtahDave/new_system.py
...
Improve wording on init() return
2013-05-28 14:09:05 -07:00
David Boucha
5aac2b0ee6
Improve wording on init() return
2013-05-28 15:08:09 -06:00
Colton Myers
380c6e3ad5
Merge pull request #5285 from UtahDave/new_system.py
...
New system module for Windows.
2013-05-28 14:05:30 -07:00
David Boucha
5725f7a0b9
Add timeouts, various improvements
2013-05-28 14:58:18 -06:00
Thomas S Hatch
95780ff219
Fix ref no non func alias in rvm test
2013-05-28 14:53:40 -06:00
Thomas S Hatch
8d018e0b8c
make gem test ref non func alias
2013-05-28 14:35:26 -06:00
Thomas S Hatch
2b917aef23
Add loop_interval to minion config for tests
2013-05-28 14:27:01 -06:00
David Boucha
e597ec80da
Add shutdown_hard, implement reboot, add timeout
2013-05-28 13:52:50 -06:00
Thomas S Hatch
6ca4860f00
Don't pass jid in non-full return per #4402
2013-05-28 13:23:59 -06:00
Thomas S Hatch
31f51ced76
Merge pull request #5283 from toddejohnson/develop
...
Fix xinetd service name to not have appended : in service name.
2013-05-28 12:20:15 -07:00
Thomas S Hatch
c69ee780e9
Merge pull request #5284 from hulu/style-fixes
...
Style fixes
2013-05-28 12:16:58 -07:00
Chris Rebert
13cb3d057f
zpool mod: rm random space
2013-05-28 12:09:41 -07:00
Chris Rebert
cb8a169099
fix spacing to comply with PEP 8
2013-05-28 12:09:08 -07:00
Chris Rebert
8539b995a5
tabs -> spaces
2013-05-28 12:01:23 -07:00
Todd E Johnson
9e6e4f52d5
Fix xinetd service name to not have appended : in service name.
2013-05-28 13:24:49 -05:00
David Boucha
a4362d1424
implement more system functions
2013-05-28 12:07:38 -06:00
David Boucha
4b5126071e
Implement system.halt on Windows
2013-05-28 11:55:53 -06:00
David Boucha
c95cc8d32c
First copy of system module for Windows
...
Copied salt/modules/system.py
Actual Windows commands have not been
implemented yet.
2013-05-28 11:50:37 -06:00
Pedro Algarvio
f00ea9a830
Merge pull request #5280 from s0undt3ch/hotfix/daemontools-syntax
...
Fix syntax error.
2013-05-28 06:41:46 -07:00
David Boucha
31775da003
Merge pull request #5279 from s0undt3ch/hotfix/fix-win-import
...
Only load module if windows required imports are available.
2013-05-28 06:00:22 -07:00
Pedro Algarvio
67117579c1
Fix syntax error.
2013-05-28 12:23:08 +01:00
Pedro Algarvio
fb14e72aef
Only load module if windows required imports are available.
...
Seems the way to do it and also stops an import traceback to be logged on Linux when importing `salt.utils.winapi`.
2013-05-28 11:57:41 +01:00
Thomas S Hatch
62be15c68c
Merge pull request #5278 from robertkeizer/reload-func-alias
...
Reload func alias
2013-05-27 22:54:53 -07:00
Thomas S Hatch
5c034fdb21
Fix string formatting, spaces and some style
...
This looks great, and is a great approach to the problem, very nice!
2013-05-28 05:51:41 +00:00
Thomas S Hatch
06063fa2d8
Merge pull request #5277 from robertkeizer/zpool
...
Removing restriction on operating system.
2013-05-27 22:44:53 -07:00
Thomas S Hatch
836183ef86
Merge pull request #5276 from robertkeizer/zfs
...
Dynamic ZFS functions.
2013-05-27 22:44:12 -07:00
Thomas S Hatch
d553973058
Update the loop_interval to 1, we have to play around with this
...
more
2013-05-28 05:40:07 +00:00
Robert Keizer
fadcfb0d3d
Upstart function aliasing
2013-05-28 00:28:42 -05:00
Robert Keizer
85d698daaf
Tomcat function aliasing
2013-05-28 00:27:55 -05:00
Robert Keizer
9c8db247d4
System reload function aliasing.
2013-05-28 00:27:15 -05:00
Thomas S Hatch
7b399bd752
Add header for schedule returner
2013-05-28 05:27:14 +00:00
Robert Keizer
10080b3761
Service reload function alias.
2013-05-28 00:26:29 -05:00
Robert Keizer
2bd586488d
FreeBSD Server function aliasing.
2013-05-28 00:25:46 -05:00
Robert Keizer
e7dd6d8187
Debian Service function alias
2013-05-28 00:24:59 -05:00