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
18,542 Commits 24 Branches 182 Tags 341 MiB
99352cee34
Commit Graph

18542 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas S Hatch
bf7f3ba426 Merge pull request #7535 from c0m4/patch-1 
add support to activate virtualenv in pip.installed
 2013-10-01 10:03:47 -07:00
Thomas S Hatch
df03e5f6a8 Merge pull request #7529 from terminalmage/packaging 
Update initscripts, spec file for 0.17.0
 2013-10-01 09:59:24 -07:00
Thomas S Hatch
0520046fbb Merge pull request #7530 from malinoff/fix-ssh-syntax 
Fix ssh syntax
 2013-10-01 09:57:57 -07:00
Adon Metcalfe
32ef270e2e Add manage.bootstrap and removekeys option to manage.down 2013-10-01 22:32:10 +08:00
Joseph Hall
a97f51deee Merge pull request #7538 from joehealy/salt-ssh-default-config 
Added default config for salt-ssh
 2013-10-01 07:05:38 -07:00
Pedro Algarvio
e490260e3f Merge pull request #7534 from holmboe/patch-2 
solaris_group used for group provider on Solaris-based OSes
 2013-10-01 06:59:18 -07:00
Pedro Algarvio
1c4fb59784 Merge pull request #7536 from holmboe/jinja-env 
Rename jinja env
 2013-10-01 06:56:40 -07:00
Joe Healy
1fa680d25c Added default config for salt-ssh 2013-10-01 23:54:51 +10:00
Henrik Holmboe
4be0dbc6d6 Easier to ask for forgiveness than permission (EAFP) 2013-10-01 15:47:47 +02:00
Henrik Holmboe
74a75e625d Use FileSystemLoader instead of DictLoader in jinja2 2013-10-01 15:39:34 +02:00
Henrik Holmboe
3587c7b71d Rename jinja env 2013-10-01 14:47:18 +02:00
Rudy Attias
97359b4a8a add support to activate option to pip.installed 
trying to solve a problem I had when installing a python package (from bzr+http) into a virtualenv that had bzr installed in the virtualenv and not the main site-packages. therefor I had to activate before installing packages with bzr+http
 2013-10-01 14:04:25 +02:00
Henrik Holmboe
3b24019f22 solaris_group used for group provider on Solaris-based OSes 2013-10-01 13:53:05 +02:00
Ajith Antony
2546cc3cc8 Repair KVM image distribution after disk_profile 
- Commit to to disk profile to carry disk info
- repair mismatch between file cache copy, and DOM XML
- embed pool info in disk_profile.  Seems consistent with the profile
  goals
- added a return value of vm_info to init (it should return something
  useful, right!)
 2013-10-01 01:40:41 -05:00
Dmitry Malinovsky
5166b10c6a Fixed PEP8 syntax 2013-10-01 10:16:15 +07:00
Dmitry Malinovsky
312890e934 Replaced insufficient string concatenation with joining list 2013-10-01 10:15:35 +07:00
Dmitry Malinovsky
c6875ffb18 Replaced insufficient string concatenation with joining list 2013-10-01 10:14:33 +07:00
Dmitry Malinovsky
879a0a083b Fixed PEP8 and some ugly constructions 2013-10-01 10:13:49 +07:00
Erik Johnson
e75fc016fd pip not needed for EPEL5 package 2013-09-30 21:56:49 -05:00
Erik Johnson
d310dcbb80 Update initscripts, spec file for 0.17.0 
This also fixes an issue with sourcing of /etc/rc.d/init.d/functions in
RHEL/CentOS/Fedora/etc., allowing the use of /etc/default/salt to
override environment variables.
 2013-09-30 21:09:25 -05:00
Thomas S Hatch
7d7d87e58c Finish fixing #7480 2013-09-30 17:33:09 -06:00
Thomas S Hatch
991d81c204 pass in the password to sshpass as a single string, fix #7480 2013-09-30 16:25:55 -06:00
Thomas S Hatch
532df1e6fb Fix #7516, could use some extra testing... 2013-09-30 16:17:50 -06:00
Thomas S Hatch
03a583341b Merge pull request #7525 from techhat/novafix 
Allow region_name to be passed through to nova module
 2013-09-30 14:09:18 -07:00
Joseph Hall
875b077e78 Add comment for region_name to docstring 2013-09-30 15:01:28 -06:00
Joseph Hall
034b2a58f3 Allow region_name to be passed through to nova module 2013-09-30 14:59:42 -06:00
Joseph Hall
e6f2f1582c Merge pull request #7523 from ifnull/develop 
Fixes typo
 2013-09-30 12:38:14 -07:00
Daniel Smith
d2a3bde793 Fixes typo 2013-09-30 12:31:05 -07:00
Erik Johnson
be9df0058f Fix regression in salt-call 
This fixes a regression that I inadvertently caused in d749e5a by
always wrapping the return data in a dict. An extra step here in the
Caller class was duplicating this action, causing a traceback when
attempting to increment the result counts for the highstate outputter.
 2013-09-30 14:20:17 -05:00
Thomas S Hatch
2eee4b54c7 Merge pull request #7521 from paluh/develop 
Shorten --ssh-priv option to --priv
 2013-09-30 09:27:21 -07:00
Tomasz Rybarczyk
a155c983f2 Shorten --ssh-priv option to --priv 2013-09-30 18:14:15 +02:00
Thomas S Hatch
163e8a48c1 Merge pull request #7514 from paluh/develop 
Add --ssh-priv option to SaltSSHOptionParser
 2013-09-30 08:56:04 -07:00
Thomas S Hatch
a1a10d3cba Merge pull request #7520 from graingert/patch-1 
Fix grammar in Watch In state documentation
 2013-09-30 08:44:37 -07:00
Thomas Grainger
7e3bf3bc12 Fix grammar in Watch In state documentation 2013-09-30 16:33:05 +01:00
Tomasz Rybarczyk
3e43d4aeb3 Add --ssh-priv option to SaltSSHOptionParser 2013-09-30 12:22:07 +02:00
Pedro Algarvio
52b3093339 Merge pull request #7513 from holmboe/skipif-version_info 
Specify reason for Python 2.7 requirement
 2013-09-30 02:00:14 -07:00
Henrik Holmboe
eea799c8c3 Specify reason for Python 2.7 requirement 
While ElementTree is in Python 2.6, we need the expanded support
for xpath which was introduced in Python 2.7.

As discussed in #7264, it might be possible to install
`elementtree-1.3a3-20070912` for Python 2.6, but this is yet untested.
 2013-09-30 10:40:13 +02:00
Thomas S Hatch
fd4866a0e1 Merge pull request #7511 from aboe76/fix_docs 
fixed both errors after sphinx build
 2013-09-29 14:29:27 -07:00
Niels Abspoel
a5d6b9649b fixed both errors after sphinx build 2013-09-29 23:27:31 +02:00
Erik Johnson
4ac4a62a2a Add --include-all arg to salt-key 
This commit adds an --include-all option to salt-key, and requires it to
be used in order to match rejected keys with salt-key -a, and accepted
keys with salt-key -r. See
https://github.com/saltstack/salt/pull/7509#issuecomment-25325666 for
more information.
 2013-09-29 14:36:52 -05:00
Olaf Lenz
3b7f65449a Install and remove packages in batches of 500 to avoid an overflow of 
the command line.
 2013-09-29 20:42:35 +02:00
Erik Johnson
b18a4ee864 Allow salt-key -a/-r to work on rejected/accepted keys 
This commit modifies salt-key so that -a looks at rejected keys in
addition to pending keys, and -r looks at accepted keys in addition to
pending keys.

The -A and -R arguments still operate on pending keys only.

In addition, this commit improves reporting on the CLI when keys are
rejected and deleted.
 2013-09-29 12:36:06 -05:00
Thomas S Hatch
83901a4dcf Merge pull request #7508 from gravyboat/develop 
Updates to multiple salt-ssh/roster docs.
 2013-09-28 22:42:21 -07:00
Forrest Alvarez
1c043c3d45 Updated the salt-ssh.rst to add the new options that are available via the command line. Modified the ssh index.rst to include a link to the salt-ssh cli commands page. Updated parsers.py to fix the default value that is present in the documentation from 5 to 25 (as 25 is the actual default). Updated roster.rst to note that the default file location is /etc/salt/roster since it was absent, and might be confusing if you head to the roster documentation before reading the rest of the salt-ssh documentation. 2013-09-29 05:16:13 +00:00
Pedro Algarvio
48981287e4 Merge pull request #7507 from holmboe/img_dir-issue-7491 
Re-add setting the location of QEMU/KVM images
 2013-09-28 19:09:19 -07:00
Henrik Holmboe
748c86dedc Re-add setting the location of QEMU/KVM images 2013-09-29 04:02:19 +02:00
Erik Johnson
905a8bd62a Update list of pkg providers in docs 2013-09-28 20:03:54 -05:00
Pedro Algarvio
e8c0917962 Merge pull request #7506 from s0undt3ch/develop 
Let's try if mocking fixes the intermittent failures of the unit test.
 2013-09-28 15:53:09 -07:00
Pedro Algarvio
516e304b96 Let's try if mocking fixes the intermittent failures of the unit test. 2013-09-28 23:50:30 +01:00
Joseph Hall
6bdcfccd08 Merge pull request #7505 from aboe76/update_suse_pkg 
updated suse pkg, inline with package guidelines
 2013-09-28 14:21:28 -07:00