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
17,709 Commits 24 Branches 182 Tags 341 MiB
e2a41de4d6
Commit Graph

17709 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas S Hatch
e2a41de4d6 if running in local mode fail cleanly on event calls 2013-09-12 22:55:56 -06:00
Thomas S Hatch
a3ae6313b5 store addr as a list in scan roster 2013-09-12 21:45:05 -06:00
Thomas S Hatch
346dac0860 pull stdout and stderr from cmd_block 2013-09-12 21:40:03 -06:00
Joseph Hall
48137b758a Merge pull request #7219 from hulu/trailing-whitespace-master 
rm trailing whitespace from master.py
 2013-09-12 20:21:22 -07:00
Joseph Hall
1f2eeeb7e0 Merge pull request #7220 from hulu/trailing-whitespace 
rm trailing whitespace
 2013-09-12 20:19:24 -07:00
Chris Rebert
900a681b51 rm trailing whitespace 2013-09-12 20:12:14 -07:00
Thomas S Hatch
2ccc51e66d Allow for ssh-copy-id to be used 2013-09-12 21:11:14 -06:00
Thomas S Hatch
ad526ff937 Add ssh-copy-id routines to shell 2013-09-12 21:10:48 -06:00
Chris Rebert
f6d2be12a0 rm trailing whitespace from master.py 2013-09-12 20:03:13 -07:00
Thomas S Hatch
219f57d242 make sure addr is a string 2013-09-12 19:02:52 -06:00
Pedro Algarvio
ae775423af Merge pull request #7208 from terminalmage/issue7206 
Remove unused kwargs from restart/reload functions
 2013-09-12 16:12:25 -07:00
David Boucha
2a3d8f5709 Merge pull request #7209 from KennethWilke/develop 
Added user role handling to keystone module and state
 2013-09-12 15:49:45 -07:00
KennethWilke
65471ebfb7 indentation fix 2013-09-12 17:49:17 -05:00
KennethWilke
6b75b654da Added role stuff to user creation 2013-09-12 17:48:37 -05:00
KennethWilke
ed457d00bb Reversed change to docstring 2013-09-12 17:42:14 -05:00
KennethWilke
95321859d4 added user role management to keystone 2013-09-12 17:40:41 -05:00
Erik Johnson
32f8c2057e Remove unused kwargs from restart/reload functions 
See #7206 for more information.
 2013-09-12 17:39:15 -05:00
Erik Johnson
54ec917208 Merge pull request #7207 from terminalmage/docs 
A few docs commits
 2013-09-12 15:13:05 -07:00
Erik Johnson
97015a5db4 Add more information about salt-call 
This adds additional information both to the walkthrough and the
"troubleshooting" page.
 2013-09-12 17:11:10 -05:00
Erik Johnson
6f96971c94 Update "current release" link to 0.16.4 2013-09-12 17:10:45 -05:00
Colton Myers
3ca7755de1 Merge pull request #7202 from pakdel/develop 
Fixed "Failed to load ext_pillar git: 'branch_name'"
 2013-09-12 14:41:25 -07:00
Colton Myers
96d3d1e100 Merge pull request #7204 from terminalmage/issue7203 
Fix missing import
 2013-09-12 14:39:15 -07:00
Colton Myers
d79a7edb6d Merge pull request #7199 from terminalmage/quickfix 
Fix tracebacks in saltmod state, saltutil.cmd{,_iter}
 2013-09-12 14:38:38 -07:00
Erik Johnson
272dba3fa0 Fix missing import 
This fixes #7203 by importing the 'os' module, required by some of the
functions imported from salt.modules.yumpkg. I also checked the other
re-namespaced functions in yumpkg5 and made sure additional modules did
not need to be imported here.
 2013-09-12 16:11:07 -05:00
Pedro Algarvio
889dedc579 Merge pull request #7201 from terminalmage/mac-user-group-management 
Update docstrings, fix missing import in mac user/group mods
 2013-09-12 14:03:04 -07:00
Erik Johnson
00757955d1 Use raw strings instead of escaped single-quotes 2013-09-12 15:56:40 -05:00
Amir Pakdel
8a097b98d3 Fixed Failed to load ext_pillar git: 'branch_name' 
If there is something like the following in the master file:
ext_pillar:
  - git: master file:///root/salt/pillar
  - git: branch_name file:///root/salt/pillar

master branch will be checked out and assigned to pillar_roots:
__opts__['pillar_roots']: {'base': ['/var/cache/salt/master/pillar_gitfs/0']}

But when trying to get branch_name branch, it will fail:
[ERROR   ] Failed to load ext_pillar git: 'branch_name'
Traceback (most recent call last):
  File "/usr/lib/python2.6/site-packages/salt/pillar/__init__.py", line 410, in ext_pillar
    ext = self.ext_pillars[key](self.opts['id'], pillar, val)
  File "/usr/lib/python2.6/site-packages/salt/pillar/git_pillar.py", line 151, in ext_pillar
    if __opts__['pillar_roots'][branch_env] == [repo.working_dir]:
KeyError: 'branch_name'
 2013-09-12 16:19:14 -04:00
Erik Johnson
145b6f51f8 Update docstrings, fix missing import in mac user/group mods 2013-09-12 15:18:58 -05:00
Thomas S Hatch
8e753da668 make sure the addr is a string 2013-09-12 14:05:28 -06:00
Erik Johnson
f60e51cfaa Fix tracebacks in saltmod state, saltutil.cmd{,_iter} 2013-09-12 14:34:29 -05:00
Colton Myers
6a00947233 Merge pull request #7194 from terminalmage/mac-user-group-management 
Initial Mac user/group management
 2013-09-12 11:47:54 -07:00
Joseph Hall
9dcb289d40 Merge pull request #7198 from evinrude/feature_sqlite3_returner 
Feature sqlite3 returner
 2013-09-12 11:33:58 -07:00
KennethWilke
c2eb32b1e2 pep8 fix 2013-09-12 12:50:44 -05:00
KennethWilke
c7a8c86c00 added role management to keystone state 2013-09-12 12:50:02 -05:00
Joseph Hall
ed652a5a5c Merge pull request #7196 from KennethWilke/develop 
Added Keystone role management
 2013-09-12 10:49:57 -07:00
KennethWilke
569a9ec770 added role_create and role_delete keystone functions 2013-09-12 12:16:55 -05:00
Mickey Malone
4899f222d1 Merge remote-tracking branch 'upstream/develop' into feature_sqlite3_returner 2013-09-12 11:50:44 -05:00
Samuel Smith
a658610d75 Merge pull request #7195 from SmithSamuelM/tempdevelop 
Fixed user in event data for wheel jobs. Also adding success field on successful returns
 2013-09-12 09:45:29 -07:00
Samuel M Smith
c446e1dbd3 added .DS_Store 2013-09-12 10:34:36 -06:00
Samuel M Smith
9a5bc5eb33 Success field also in ret events 
Fixed user field in events
changed __stamp__ to _stamp in events

Conflicts:
	salt/master.py
 2013-09-12 10:29:42 -06:00
Erik Johnson
469f771227 Change user states to accommodate MacOS 
This commit makes a couple tweaks to the user states to make them work
with the new MacOS support. It also fixes a few edge-case bugs that were
encountered while troubleshooting.
 2013-09-12 09:11:31 -05:00
Erik Johnson
9f6293b63c finish mac user/group support 2013-09-12 09:11:31 -05:00
Erik Johnson
5777c52cf6 add contains_whitespace 
A simple utility function that returns True if the string passed to it
contains whitespace.
 2013-09-12 09:11:31 -05:00
Erik Johnson
abb87863f8 Add mac user/group modules 
Initial in-progress commits of mac-specific user/group modules.
 2013-09-12 09:11:31 -05:00
Mickey Malone
c52f9bf9d8 Merge remote-tracking branch 'upstream/develop' into feature_sqlite3_returner 2013-09-12 08:55:03 -05:00
Mickey Malone
ee76e5d4aa Fixed some minor issues encountered while performing functional tests 2013-09-12 07:33:19 -05:00
Joseph Hall
6a3d5d6596 Merge pull request #7193 from s0undt3ch/develop 
Added `versionadded` where appropriate.
 2013-09-12 04:59:00 -07:00
Pedro Algarvio
c60b1bc861 Added versionadded where appropriate. 2013-09-12 12:48:19 +01:00
Mickey Malone
bf5ea55334 Merge remote-tracking branch 'upstream/develop' into feature_sqlite3_returner 2013-09-12 06:36:03 -05:00
Pedro Algarvio
1affa0a780 Merge pull request #7189 from gravyboat/develop 
updated troubleshooting index to add selinux commands for CentOS/RHEL 6.
 2013-09-12 03:21:21 -07:00