Commit Graph

36842 Commits

Author SHA1 Message Date
Pedro Algarvio
672e98cf0f Use requests instead of github package. Also output the PR incoming branch. 2014-11-21 23:33:29 +00:00
Thomas S Hatch
864ad4b3a2 Merge pull request #18378 from rallytime/bp-18079
Backport #18105 to 2014.7
2014-11-21 16:13:57 -07:00
Thomas S Hatch
681fe94b65 Merge pull request #18375 from rallytime/remove_unused_arg
Remove 'repo' argument as it isn't used by function
2014-11-21 16:13:07 -07:00
Thomas S Hatch
0b4c8b9ab2 Merge pull request #18363 from jacksontj/2014.7
Fix for #8670
2014-11-21 16:12:52 -07:00
Thomas S Hatch
644f69eb75 Merge pull request #18343 from thatch45/requests_crazy
Fix #18131
2014-11-21 16:04:00 -07:00
Thomas S Hatch
1b68371494 Merge pull request #18376 from thatch45/18361
Add sdecode for highstate
2014-11-21 16:03:35 -07:00
Thomas S Hatch
c858e4391f Merge pull request #18365 from jacksontj/2014.7-config
Better output on requisite failure
2014-11-21 16:00:53 -07:00
Thomas S Hatch
be494c9c4a Merge pull request #18374 from thatch45/18053
Add new sdecode to nested outputter
2014-11-21 15:54:33 -07:00
Thomas S Hatch
e3716ab322 Merge pull request #18383 from thatch45/stray_print
remove stray print
2014-11-21 15:48:46 -07:00
Thomas S Hatch
590b5a3a56 iremove stray print 2014-11-21 15:44:28 -07:00
Thomas S Hatch
ec94a468ee more lint 2014-11-21 14:27:52 -07:00
Tait Clarridge
c4a07faf09 Fix for cross-platform sysctl with test and custom config location when using systemd >= 207
When using a custom config path for sysctl states, it would fail with an IOError
as it was looking for the defaults which also may not exist as shown below:

----------
          ID: net.ipv4.tcp_keepalive_intvl
    Function: sysctl.present
      Result: False
     Comment: An exception occurred in this state: Traceback (most recent call last):
                File "/usr/lib/python2.7/site-packages/salt/state.py", line 1533, in call
                  **cdata['kwargs'])
                File "/usr/lib/python2.7/site-packages/salt/states/sysctl.py", line 56, in present
                  configured = __salt__['sysctl.show'](config_file=True)
                File "/usr/lib/python2.7/site-packages/salt/modules/linux_sysctl.py", line 86, in show
                  for line in salt.utils.fopen(config_file_path):
                File "/usr/lib/python2.7/site-packages/salt/utils/__init__.py", line 1065, in fopen
                  fhandle = open(*args, **kwargs)
              IOError: [Errno 2] No such file or directory: '/etc/sysctl.d/99-salt.conf'

The corresponding state had a config file specified that was ignored. But this would hold true for any
minion meeting the systemd conditions and not having 99-salt.conf. Now, for normal highstate runs, the current
and configured options are not run unless test is specified and if the configured check returns none, the
user will be notified that there was an issue reading the default/specified file.

Platforms other than linux also appeared to not have the config_file argument for show() that would have probably (I did not verify) bail out with argument number errors during normal runs.

Conflicts:
	salt/modules/netbsd_sysctl.py
	salt/modules/openbsd_sysctl.py
2014-11-21 14:26:46 -07:00
Thomas S Hatch
69e2a2d9fe remove unused imports 2014-11-21 14:01:00 -07:00
Thomas S Hatch
f4ddb529e1 Use sdecode in highstate 2014-11-21 13:59:58 -07:00
Thomas S Hatch
b1e2d289fe Merge pull request #18366 from thatch45/saltfile_parser
Get non standard saltfile opts into opts
2014-11-21 13:58:55 -07:00
rallytime
0d2e6a0456 Remove 'repo' argument as it isn't used by function 2014-11-21 13:57:15 -07:00
Thomas S Hatch
789ad7b901 Add new sdecode to nested outputter 2014-11-21 13:53:06 -07:00
Thomas S Hatch
be35e1cef8 Merge pull request #18367 from thatch45/sdecode
initial sdicode function
2014-11-21 13:21:03 -07:00
Thomas S Hatch
5a895fb85b disable lint error 2014-11-21 13:18:35 -07:00
Thomas S Hatch
bc2f0f8995 unicide, prevent returning None 2014-11-21 12:08:24 -07:00
Thomas S Hatch
f59f193374 get the right locale 2014-11-21 12:05:22 -07:00
Thomas S Hatch
38b1ca05af make the encodings list more robust 2014-11-21 12:03:15 -07:00
Thomas S Hatch
a9577b2e82 initial sdicode function 2014-11-21 11:49:32 -07:00
Thomas S Hatch
1bfc9c6198 Add extra_filerefs to salt-ssh options 2014-11-21 11:12:07 -07:00
Thomas S Hatch
6fd2389e58 Add non standard opts into saltfile 2014-11-21 10:58:59 -07:00
Thomas Jackson
347d68aa44 More comments, and a more specific key for the comment_dict (so you can know which SLS it was) 2014-11-21 09:33:58 -08:00
Thomas Jackson
6118590a6a Fix for #15663
On a requisite failure, instead of saying "something failed" we can determine what the failures where by looking at the requisites of the lowstate running, and see which ones failed.
2014-11-21 09:33:52 -08:00
Thomas S Hatch
481a52c03f Fix part 1 of #18353 2014-11-21 10:26:41 -07:00
Thomas S Hatch
c02e2e9135 Merge pull request #18281 from cro/mdadm_update
Properly quote parameters to mdadm
2014-11-21 10:14:09 -07:00
Thomas Jackson
44f91a1d21 Add regression test for #8670
Before the fix in #18363 get_event would return None on the first non-matching event (since wait was 0), this is to verify that get_event works properly with a wait of 0
2014-11-21 08:54:05 -08:00
Thomas S Hatch
3b91d96e9d Merge pull request #18364 from thatch45/nacl_check
check for the OSError that libnacl might throw if libsodium is no here
2014-11-21 09:50:33 -07:00
Thomas S Hatch
59feb4ddfc check for the OSError that libnacl might throw if libsodium is no here 2014-11-21 09:49:04 -07:00
Thomas Jackson
f5259378b8 Fix for #8670
We should only update the wait timeout on mis-matched event if we had a timeout to begin with
2014-11-21 08:48:25 -08:00
Thomas S Hatch
1af14920a8 Merge pull request #18350 from thatch45/key_race
Fix key gen race condition, fix #17289
2014-11-21 09:40:42 -07:00
Thomas S Hatch
5e41adfa80 Merge pull request #18349 from rallytime/bp-18049
Backport #18049 to 2014.7
2014-11-21 09:40:21 -07:00
Thomas S Hatch
dc672d9114 Merge pull request #18348 from thatch45/unpriv_jid
Fix error with perm denial on unpriv job lookups
2014-11-21 09:40:07 -07:00
Thomas S Hatch
c5d3d421b4 don't need the pass 2014-11-21 09:39:49 -07:00
Thomas S Hatch
b2350884d9 Merge pull request #18347 from rallytime/bp-17706
Backport #17706 to 2014.7
2014-11-21 09:38:55 -07:00
Thomas S Hatch
c7b9af2654 Merge pull request #18346 from jfindlay/quote_rvm
quote shell strs in rvm mod
2014-11-21 09:38:49 -07:00
Thomas S Hatch
b55fe1b4df Merge pull request #18344 from cachedout/pyenv_quote
quote pyenv
2014-11-21 09:38:24 -07:00
Thomas S Hatch
ed3851c156 Merge pull request #18340 from cachedout/pecl_quote
quote pecl
2014-11-21 09:37:09 -07:00
Thomas S Hatch
fafe2f4daa Merge pull request #18336 from wuxxin/2014.7
fixes #18331
2014-11-21 09:36:31 -07:00
Thomas S Hatch
8b2787b9a9 Merge pull request #18332 from cachedout/vmadm_quote
fix args
2014-11-21 09:36:21 -07:00
Nicole Thomas
bc5f4c3e80 Merge pull request #18328 from jacksontj/2014.7
Change all saltnado asserts to unittest asserts.
2014-11-20 20:27:19 -07:00
Thomas Jackson
75bf7bd091 pylint fix 2014-11-20 18:35:41 -08:00
Thomas Jackson
0a1b88e6b5 Change all saltnado asserts to unittest asserts. This way when there is a failure you get nice pretty printouts! 2014-11-20 18:35:41 -08:00
Pedro Algarvio
6a530e7b89 Merge pull request #18345 from thatch45/tar_fix
Always extract when extracting
2014-11-21 00:48:23 +00:00
Thomas S Hatch
beb85d353b Fix key gen race condition, fix #17289 2014-11-20 16:14:19 -07:00
Adrien "ze" Urban
8e3e2d0fb2 fix: (netbsd)sysctl.persist (state was broken)
states/sysctl calls sysctl.persist with config file, regardless of the
OS. *_sysctl do have that parameter, but netbsd_sysctl.

Now, netbsd_sysctl takes a config file with a default value like the
others.
2014-11-20 16:02:14 -07:00
Adrien "ze" Urban
07a2a58089 fix: netbsd_sysctl.persist with new key
When the key was not already present in sysctl.conf, the creatin was
still trying to access the (un)matched line groups.
2014-11-20 15:59:21 -07:00