valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
10,873 Commits 24 Branches 182 Tags 341 MiB
c92e2f3373
Commit Graph

10873 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas S Hatch
53b9a10ac2 Add reset function to virt runner 2013-02-13 19:14:18 -05:00
Thomas S Hatch
739c0bb59c Add state_terse config option and terse kwarg to state.highstate 
and state.sls

now in the master config you can set state_data: terse to trim out
all of the "greens" or pass terse=True to state.highstate or state.sls
 2013-02-13 16:28:46 -07:00
Thomas S Hatch
869dd9e102 Add start and force_off runner functions 2013-02-13 18:24:56 -05:00
Thomas S Hatch
f29303eeb7 Merge branch 'develop' of github.com:saltstack/salt into develop 2013-02-13 18:24:52 -05:00
Thomas S Hatch
05a742ec28 Merge pull request #3715 from rca/test_file_sed_limit 
Added test for limit in file.sed.
 2013-02-13 15:18:30 -08:00
Roberto Aguilar
c0c67a7509 Added test for limit in file.sed. 2013-02-13 14:36:34 -08:00
Thomas S Hatch
3b616bc515 fix bad ref to vm name 2013-02-13 14:01:10 -05:00
David Boucha
e51e6df47d Add link to writing State docs 2013-02-13 11:34:06 -07:00
Thomas S Hatch
cf2c1aee15 Add state check to virt_query 2013-02-13 13:34:02 -05:00
Thomas S Hatch
c23bb2b72e Merge pull request #3709 from herlo/develop 
update the start / kill order with chkconfig
 2013-02-13 10:21:21 -08:00
Clint Savage
fe22763da0 update the start / kill order with chkconfig 2013-02-13 11:17:33 -07:00
Thomas S Hatch
5014b7640c Merge pull request #3700 from giantlock/develop 
Postgres module corrections
 2013-02-13 09:22:49 -08:00
Thomas S Hatch
c9a3cfbadb Merge pull request #3707 from sbworth/develop 
Add optional key argument to display subtree of pillar data
 2013-02-13 09:17:34 -08:00
Thomas S Hatch
26dc7457a3 Merge pull request #3704 from holmboe/alternative-salt-executables 
Allow alternative executables
 2013-02-13 09:16:48 -08:00
Thomas S Hatch
c6ffcd513a Merge pull request #3698 from sshturm/setuptools_fix 
Import install command from setuptools if we use them.
 2013-02-13 09:11:57 -08:00
Thomas S Hatch
d4028b6a1c Merge pull request #3697 from rca/escape_limit_in_file_dot_sed 
Updated limit to be escaped like before and after.
 2013-02-13 09:09:41 -08:00
Steven Butterworth
80b008f7d0 Add optional key argument to display subtree of pillar data 
The output of pillar.data comprises a substantial chunk of data.
By introducing key selection on the dictionary, we can display
the subtree of immediate interest.

Inadequacy: Should allow for arbitrary keying into subsections
of the data. Current change is the simplest useful improvement.
 2013-02-13 11:38:50 -05:00
Henrik Holmboe
4fa8e63033 Fix the LSB header 
I got complaints from insserv that the LSB header was not compliant. It was
missing required keywords, which must be there even if they are empty.
 2013-02-13 16:32:49 +01:00
Henrik Holmboe
464ca9dd1f Allow alternative executables 
With this commit it is possible to use virtualenv with the init scripts.

For example, I have this in my /etc/default/salt:

```
SALTMASTER=/srv/venvs/venv-1/bin/salt-master
SALTMINION=/srv/venvs/venv-1/bin/salt-minion
SALTSYNDIC=/srv/venvs/venv-1/bin/salt-syndic
SALTAPI=/srv/venvs/venv-1/bin/salt-api
PYTHON=/srv/venvs/venv-1/bin/python
```
 2013-02-13 15:30:13 +01:00
Denis Generalov
aa8b50b92e Merge branch 'pgsql' into develop 
Conflicts:
	salt/modules/postgres.py
 2013-02-13 14:54:30 +04:00
Svetlana Shturm
6dac3120a8 Import install command from setuptools if we use them. 
This commit fixes bug with option --single-version-externally-managed.
 2013-02-13 14:53:39 +04:00
Roberto Aguilar
310ba3d555 Updated limit to be escaped like before and after. 2013-02-13 00:58:18 -08:00
Thomas S Hatch
c0efc5dc20 Add vm_info and destroy to the virt runner 2013-02-13 03:16:10 -05:00
Thomas S Hatch
5b8769c4c6 Merge branch 'develop' of github.com:saltstack/salt into develop 2013-02-13 02:28:37 -05:00
Thomas S Hatch
6cdc8a4573 Get the outputter going for virt 2013-02-13 02:26:41 -05:00
Thomas S Hatch
34b3f9b4c4 Add the start of the virt runner 2013-02-13 02:26:19 -05:00
Thomas S Hatch
f3774a2961 Add virt.init, a command to init vms from basic input 2013-02-13 02:25:48 -05:00
Thomas S Hatch
3f5a779972 Add config.py defaults for virt.images 2013-02-13 02:24:28 -05:00
Thomas S Hatch
a8834daa9a Merge pull request #3695 from archtaku/issue3693 
Fix #3693 (variable ref'ed before assignment)
 2013-02-12 19:52:48 -08:00
Erik Johnson
4149529db6 Fix #3693 (variable ref'ed before assignment) 
Also, fix another reference before assignment in the "test=True" code
block
 2013-02-12 21:48:22 -06:00
Thomas S Hatch
6287a62f36 Merge pull request #3692 from whiteinge/cmd-cwd-default 
Removed default for cwd in various cmd states
 2013-02-12 14:37:08 -08:00
Seth House
42bf698b75 Updated more occurances of a default cwd 2013-02-12 15:27:43 -07:00
Seth House
ff38b2707f Removed default value for cwd 
This was preventing the logic for divining the default value based on
the current user in the execution module meaning that states specifying
a non-root ``user`` param also needed to specify a ``cwd`` param.
 2013-02-12 15:26:22 -07:00
Thomas S Hatch
b9e517640a Merge pull request #3691 from archtaku/docs 
Add version spec info to 0.13.0 release notes
 2013-02-12 14:22:40 -08:00
Erik Johnson
b38a942660 Add version spec info to 0.13.0 release notes 2013-02-12 16:20:53 -06:00
Thomas S Hatch
9c241e91d6 Fix stack trace introduced with 7c46123 2013-02-12 14:56:53 -07:00
Seth House
47fa18c6e2 Fixed spelling error in release notes 
Thanks @SEJeff
 2013-02-12 14:39:26 -07:00
Thomas S Hatch
adf6018a68 update man pages for 0.13.0 2013-02-12 12:02:51 -07:00
Thomas S Hatch
d0d73d8efd Fix issue with rh_ip import change 2013-02-12 11:41:13 -07:00
Thomas S Hatch
96071d8b0d Remove cluser docs 2013-02-12 11:41:01 -07:00
Thomas S Hatch
c0c5d6dac2 Merge pull request #3689 from seanchannel/develop 
local repo git example
 2013-02-12 10:29:44 -08:00
Thomas S Hatch
6c033c9533 bump version to 0.13.0 2013-02-12 11:14:03 -07:00
Thomas S Hatch
09d48efc3f update rpm spec version 2013-02-12 11:14:03 -07:00
Thomas S Hatch
2880ee96ce update arch package 2013-02-12 11:14:03 -07:00
Sean Channel
13c6569269 local repo git example 2013-02-12 10:12:25 -08:00
Joseph Hall
e8f51aeed2 Merge pull request #3688 from UtahDave/develop 
Update Windows Salt Installer version to 0.13.0
 2013-02-12 10:11:12 -08:00
David Boucha
065cfc4bf4 Update Windows Salt Installer version to 0.13.0 2013-02-12 11:08:59 -07:00
Thomas S Hatch
c85bcb1e46 Merge pull request #3686 from kjkuan/bugfix_merge_included_states 
Fix #3649.
 2013-02-12 09:55:59 -08:00
Jack Kuan
cde727ae63 Err! Swapped the paramters: sls and env... 2013-02-12 11:52:12 -05:00
Thomas S Hatch
4ad0110caf fix exposed ppa function 2013-02-12 09:36:27 -07:00