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
17,689 Commits 24 Branches 182 Tags 341 MiB
3ca7755de1
Commit Graph

17689 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Joseph Hall
ed652a5a5c Merge pull request #7196 from KennethWilke/develop 
Added Keystone role management
 2013-09-12 10:49:57 -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
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
Forrest Alvarez
168776a639 updated troubleshooting index to add selinux commands for CentOS/RHEL 6. 2013-09-12 05:01:51 +00:00
Seth House
e4878683c7 Merge pull request #7188 from terminalmage/docs 
Audit module documentation (T)
 2013-09-11 21:40:46 -07:00
Erik Johnson
6dc1ef4e4f Audit module documentation (T) 
This commit continues the work started in 7d4739d, putting CLI examples
in bash code-blocks to give them syntax highlighting on
docs.saltstack.com.
 2013-09-11 23:37:06 -05:00
Seth House
4e0f523ede Added configuration entries to allow translating Salt docs 2013-09-11 22:23:46 -06:00
Mickey Malone
213bf32795 Missed one 2013-09-11 22:44:13 -05:00
Mickey Malone
8e8ea379e9 Added the sqlite3 returner to the docs. Fixed spelling mistakes. 2013-09-11 22:39:54 -05:00
Mickey Malone
5601cbb3af Merge remote-tracking branch 'upstream/develop' into feature_sqlite3_returner 2013-09-11 22:07:01 -05:00
Mickey Malone
c243bf8738 Initial stab at the sqlite3 returner 2013-09-11 22:06:09 -05:00
Joseph Hall
e970915e77 Merge pull request #7182 from holmboe/patch-1 
Type in cloud_controller.rst
 2013-09-11 13:09:23 -07:00
Henrik Holmboe
009326f7f9 Type in cloud_controller.rst 2013-09-11 21:36:31 +02:00
Joseph Hall
dd57234ded Merge pull request #7181 from holmboe/patch-1 
Typo in loader.py
 2013-09-11 11:46:39 -07:00
Henrik Holmboe
5e55996fed Typo in loader.py 2013-09-11 20:45:18 +02:00
Joseph Hall
9b01298e88 Merge pull request #7180 from micahhausler/document/py_renderer 
Added documentation of global variables and example code
 2013-09-11 10:02:53 -07:00
micahhausler
26bbff4ebc Added documentation of global variables and example code 
This example makes use of the updated global "dunder" variables
updated in #7121
 2013-09-11 12:17:52 -04:00
Joseph Hall
d2f1215971 Merge pull request #7170 from hulu/filename-instead-of-file 
ssh: rename file => filename, to not shadow the built-in
 2013-09-11 05:38:00 -07:00
Joseph Hall
a794d1c0d2 Merge pull request #7171 from hulu/unused-git-pillar-imports 
rm unused imports in git pillar
 2013-09-11 05:37:32 -07:00
Joseph Hall
884599312d Merge pull request #7168 from hulu/alternatives-set-func-alias 
add __func_alias__ for modules.alternatives.set()
 2013-09-11 05:37:10 -07:00
Joseph Hall
87ea12fd28 Merge pull request #7169 from hulu/func-aliases 
add more func aliases to avoid shadowing built-ins
 2013-09-11 05:36:42 -07:00
Joseph Hall
5732ad15db Merge pull request #7173 from cvrebert/patch-3 
honor `profile` arg to modjk.list_running_members()
 2013-09-11 05:36:15 -07:00
Joseph Hall
3d9c25d7ad Merge pull request #7174 from hulu/upstart-full-restart-kwargs 
rm **kwargs from modules.upstart.full_restart()
 2013-09-11 05:35:50 -07:00