Commit Graph

18366 Commits

Author SHA1 Message Date
Thomas S Hatch
ab4d64e979 Set the jid for the State class 2013-10-02 04:32:05 -06:00
Thomas S Hatch
340302ed03 Merge pull request #7509 from terminalmage/issue7399
Allow salt-key -a/-r to work on rejected/accepted keys
2013-10-01 15:24:54 -07:00
Thomas S Hatch
191f6a7b8d Merge pull request #7533 from ajithhub/virt_image_path_problem
Repair virt.init KVM image distribution after disk_profile
2013-10-01 15:20:49 -07:00
Thomas S Hatch
14ef2e1a5c Merge pull request #7551 from ajithhub/ssh_pep8_regression
Repair SSH regressions from repairing "ugly"
2013-10-01 15:19:21 -07:00
root
73ebbf900c Repair regressions from repairing "ugly"
879a0a083b

- dict.update returns None
- dict.get with default is logocally differnt from the original boolean test
2013-10-01 15:14:04 -07:00
Thomas S Hatch
8daa55f7d7 Add more dunder dict docs per @cachedout
There are still a few esoterics to get in from some of the backend
module systems, but these are the big ones
2013-10-01 16:10:22 -06:00
Thomas S Hatch
90be4d0252 Merge pull request #7550 from terminalmage/zypper-cleanup
Corrections/cleanup from zypper batching refactor
2013-10-01 15:01:33 -07:00
Erik Johnson
2b48d73cc0 Corrections/cleanup from zypper batching refactor
This builds on pull request #7510, correcting a logic issue as well as
making some PEP8 fixes.
2013-10-01 16:52:29 -05:00
Erik Johnson
2ef086a6a3 Merge pull request #7510 from olenz/develop
Handling of long package lists for zypper
2013-10-01 14:08:52 -07:00
Colton Myers
2d8d012aa9 Merge pull request #7548 from basepi/sshfix7474
Fix yaml.yaml error
2013-10-01 12:37:55 -07:00
Colton Myers
f4412b9a7b Fix yaml.yaml error
This was fixed in 0.17 but not in develop.
2013-10-01 13:36:54 -06:00
Colton Myers
d9f5afb5ff Merge pull request #7522 from terminalmage/issue7456
Fix regression in salt-call
2013-10-01 12:29:01 -07:00
Thomas S Hatch
81584ec883 Merge pull request #7547 from hulu/rdp-pylint-fixes
fix pylint warnings in rdp module
2013-10-01 12:03:24 -07:00
Thomas S Hatch
77fff17f1b plug state events into state runtime 2013-10-01 12:39:52 -06:00
Thomas S Hatch
f93deaaf17 Add state_events to the mopts system 2013-10-01 12:19:19 -06:00
Thomas S Hatch
a504c02902 Add method to fire an event on the master 2013-10-01 12:14:40 -06:00
Chris Rebert
4016dbec6a fix pylint warnings in rdp module 2013-10-01 11:12:08 -07:00
Thomas S Hatch
ff48661863 Pass jid through to State executor 2013-10-01 11:54:41 -06:00
Thomas S Hatch
8ce5ce3cf8 We don't need controlpersist! 2013-10-01 11:34:53 -06:00
Thomas S Hatch
9ba2f13fdc Merge pull request #7468 from ranl/rdp
using powershell full path
2013-10-01 10:30:25 -07:00
Thomas S Hatch
3fe2dd80e2 use self.avail to avoid repeated calls to fileserver 2013-10-01 11:16:19 -06:00
Thomas S Hatch
30510272a0 Merge pull request #7498 from terminalmage/issue7455
Fix regression in wildcard includes
2013-10-01 10:20:49 -07:00
Thomas S Hatch
860fae142e Merge pull request #7541 from adonm/manage.bootstrap
Added manage.bootstrap and removekeys option to manage.down
2013-10-01 10:07:29 -07:00
Thomas S Hatch
61ef719e1c Merge pull request #7537 from holmboe/serial-template-file
Use FileSystemLoader instead of DictLoader in jinja2
2013-10-01 10:05:27 -07:00
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