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
41,897 Commits 24 Branches 182 Tags 341 MiB
3223625e4a
Commit Graph

41897 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas S Hatch
38bd744a53 Merge pull request #18207 from thatch45/kostko-pyobjects-salt-call 
Merge #18196 with fixes
 2014-11-18 10:10:32 -07:00
Mike Place
a8162f64ad Fix typo 2014-11-18 09:56:18 -07:00
Joseph Hall
8ac080e791 Account for possibly missing data structures 2014-11-18 09:53:20 -07:00
Thomas Jackson
aa1faeba78 Merge branch '2014.7' of github.com:jacksontj/salt into 2014.7 2014-11-18 08:51:08 -08:00
Samuel Smith
02fc2d091d Merge pull request #18208 from SmithSamuelM/sam_call2 
Fix some bugs. Better support for new async salt-run. preliminary support for syndic
 2014-11-18 09:34:59 -07:00
Thomas S Hatch
2ca4c9f954 Merge pull request #18204 from whiteinge/doc-state.event-sh-ex 
Add a few improvements and fixes to the state.event shell script example
 2014-11-18 09:34:41 -07:00
Thomas S Hatch
5993011a0a Merge pull request #18205 from eliasp/2014.7-.gitignore-add-lib64 
Add 'lib64' to .gitignore which might be created by 'virtualenv'.
 2014-11-18 09:34:13 -07:00
Thomas S Hatch
27c9c52dc2 Merge pull request #18202 from rominf/virtualbox 
vbox_guest module: not upgrade OS by default (can be unexpected)
 2014-11-18 09:28:44 -07:00
Thomas S Hatch
01fcd88160 Merge pull request #18200 from ianare/systemd_grains 
add systemd info in grains
 2014-11-18 09:28:14 -07:00
Thomas S Hatch
12fcadd0d1 Merge pull request #18197 from nmadhok/doc-fixes 
Fixing sphinx violations and errors
 2014-11-18 09:25:26 -07:00
Thomas S Hatch
6a987f2345 lint fixes 2014-11-18 09:23:25 -07:00
Samuel M Smith
efea829443 Merge remote-tracking branch 'upstream/develop' into sam_call2 2014-11-18 09:21:07 -07:00
Thomas S Hatch
b13c5ceee1 Merge branch 'pyobjects-salt-call' of https://github.com/kostko/salt into kostko-pyobjects-salt-call 2014-11-18 09:21:02 -07:00
Samuel M Smith
4b204727fb revert inhibiition of return since it breaks salt-run which is expecting the return. 
restore after fixing salt-run
 2014-11-18 09:15:09 -07:00
Samuel M Smith
bf3b20a787 Stop calling destroy on __del__ as there is a race condition where modules are unloaded 
so the close of the stack.server will fail with exception.
Need to call destroy manually when done using the stack
 2014-11-18 09:13:44 -07:00
Thomas Jackson
8c06556215 De-dupe imports 2014-11-18 08:13:16 -08:00
Thomas S Hatch
ae6c6a0dbe Merge pull request #18195 from thatch45/ext_dir 
remove the ext dir, we don't use it
 2014-11-18 09:13:09 -07:00
Samuel M Smith
75ed32e3d9 Fix exception when missing name of module to load 2014-11-18 09:12:11 -07:00
Thomas S Hatch
c2471283e6 Merge pull request #18206 from saltstack/revert-17284-develop 
Revert "Read Pillar files into OrderedDict to preserve source order"
 2014-11-18 09:11:34 -07:00
Thomas S Hatch
e07cd2134b Revert "Read Pillar files into OrderedDict to preserve source order" 2014-11-18 09:11:27 -07:00
Elias Probst
a39dfb98a2 Add 'lib64' to .gitignore which might be created by 'virtualenv'. 
On 64bit systems, 'lib64' might be created as a symlink to './lib'.
 2014-11-18 17:05:15 +01:00
Thomas Jackson
fbc48e6d9d Move exception over to format_call 
This means we can catch typos in formatting and not let the reactor process die. Previously it would die with something like:
```
Process Reactor-6:
Traceback (most recent call last):
  File "/usr/lib64/python2.7/multiprocessing/process.py", line 258, in _bootstrap
    self.run()
  File "/home/jacksontj/src/salt/salt/utils/event.py", line 686, in run
    self.call_reactions(chunks)
  File "/home/jacksontj/src/salt/salt/utils/event.py", line 672, in call_reactions
    self.wrap.run(chunk)
  File "/home/jacksontj/src/salt/salt/utils/event.py", line 707, in run
    f_call = salt.utils.format_call(l_fun, low)
  File "/home/jacksontj/src/salt/salt/utils/__init__.py", line 861, in format_call
    used_args_count
SaltInvocationError: run takes at least 1 argument (0 given)
```

Now you'll just get an error logged which looks something like:

```
[ERROR   ] Failed to execute run: <bound method ReactWrap.run of <salt.utils.event.ReactWrap object at 0x1f6f850>>
Traceback (most recent call last):
  File "/home/jacksontj/src/salt/salt/utils/event.py", line 708, in run
    f_call = salt.utils.format_call(l_fun, low)
  File "/home/jacksontj/src/salt/salt/utils/__init__.py", line 861, in format_call
    used_args_count
SaltInvocationError: run takes at least 1 argument (0 given)
```
 2014-11-18 07:54:48 -08:00
Seth House
69448ef3d8 Add a few improvements and fixes to the state.event shell script example 2014-11-18 09:50:11 -06:00
Roman Inflianskas
382896f98f vbox_guest module: not upgrade OS by default (can be unexpected) 2014-11-18 17:40:36 +03:00
Ianaré Sévi
3bcc8d4d08 fix pylint 2014-11-18 13:16:26 +01:00
Ianaré Sévi
6000656c1c add systemd info in grains 2014-11-18 11:38:16 +01:00
Nitin Madhok
3306ac2e21 Including doc in toctree 2014-11-18 03:26:54 -05:00
Nitin Madhok
71d964bccf Removing non existing document 2014-11-18 03:10:59 -05:00
Nitin Madhok
31ffaff1e7 Fixes #18114 2014-11-18 03:06:11 -05:00
Nitin Madhok
5d8ae4e32f Fixing sphinx violations and errors 2014-11-18 02:53:40 -05:00
Thomas S Hatch
8c8771848e remove the ext dir, we don't use it 2014-11-18 00:25:07 -07:00
Jernej Kos
0e8e75cb8f Changed the way pyobjects __salt__ wrapper works. 2014-11-18 08:14:30 +01:00
Thomas S Hatch
f31cd73808 Merge pull request #18192 from terminalmage/quickfix 
Remove heading line from states (A-B)
 2014-11-17 22:11:17 -07:00
Thomas S Hatch
e4d51d0b7c Merge pull request #18193 from dmyerscough/develop 
Fixing #18181
 2014-11-17 22:10:48 -07:00
Damian Myerscough
d9207d329b #18183 Fixing minor typo 2014-11-17 20:47:27 -08:00
Damian Myerscough
2cdabbefe4 Fixing #18181 2014-11-17 20:45:13 -08:00
Erik Johnson
e831edce92 Remove heading line from states (A-B) 
This cleans up some ugliness from the sphinx autosummary. See
http://docs.saltstack.com/en/latest/ref/states/all/index.html for
examples of the "====" line appearing.
 2014-11-17 22:14:06 -06:00
Thomas S Hatch
89f8490b39 Merge pull request #18188 from whiteinge/doc-orchesrtate-crossref 
Added several Orchestrate cross-references and details
 2014-11-17 21:13:26 -07:00
Thomas S Hatch
10d1d490d4 Merge pull request #18187 from whiteinge/doc-key-events 
Added documentation for key events
 2014-11-17 21:12:39 -07:00
Thomas S Hatch
6d87d65cf4 Merge pull request #18186 from whiteinge/faq-nohup-restart 
Added nohup example to the FAQ about restarting Salt with Salt
 2014-11-17 21:12:33 -07:00
Thomas S Hatch
319e5af637 Merge pull request #18184 from cvrebert/patch-1 
utils/__init__.py: rm redundant import of six.string_types
 2014-11-17 21:12:15 -07:00
Thomas S Hatch
8355c999fc Merge pull request #18170 from rallytime/file_append_fix 
Wrap map function in a list so file.append will work
 2014-11-17 21:11:37 -07:00
Thomas S Hatch
d890f87433 Merge pull request #18169 from jfindlay/recmd_timezone 
update timezone.py shell cmds
 2014-11-17 21:10:20 -07:00
Thomas S Hatch
c12a900ac0 Merge pull request #18191 from thatch45/jfindlay-quote_yum 
Jfindlay quote yum
 2014-11-17 21:09:52 -07:00
Thomas S Hatch
845cf68819 lint 2014-11-17 21:09:33 -07:00
Thomas S Hatch
281f02074d don't load stdlib 2014-11-17 21:07:26 -07:00
Thomas S Hatch
d9a7025ac0 Merge branch 'quote_yum' of https://github.com/jfindlay/salt into jfindlay-quote_yum 2014-11-17 21:06:19 -07:00
Thomas S Hatch
9e3bd9eb64 Merge pull request #18164 from cachedout/mac_group_quote 
pass shell arg
 2014-11-17 21:05:37 -07:00
Thomas S Hatch
7c186693ae Merge pull request #18163 from cachedout/keyboard_quote 
Set shell on keyboard module calls
 2014-11-17 21:05:28 -07:00
Thomas S Hatch
acf2728a92 Merge pull request #18190 from thatch45/cachedout-debian_ip_quote 
Cachedout debian ip quote
 2014-11-17 21:05:08 -07:00