Commit Graph

45075 Commits

Author SHA1 Message Date
Thomas S Hatch
61084e4370 Merge pull request #20303 from techhat/sslext
Copy ssl_match_hostname into ext
2015-02-02 14:08:30 -07:00
Colton Myers
612f2b0133 Catch msgpack errors from cmd.run for salt-ssh
Fixes #20276
2015-02-02 13:52:34 -07:00
Mike Place
68418d79a7 Typo 2015-02-02 13:52:26 -07:00
Mike Place
5291cf7809 Better detection for minimum pyzmq version 2015-02-02 13:52:26 -07:00
Steve Weber
6de9d62556 fix returning docs when some minions did not return
when using
```salt \* pkg -d```
some minions will not return and you get an ugly error:

```
[root@salt salt]# salt oat-app\* pkg -d
[ERROR   ] An un-handled exception was caught by salt's global exception handler:
TypeError: string indices must be integers, not str
Traceback (most recent call last):
  File "/usr/bin/salt", line 10, in <module>
    salt_main()
  File "/usr/lib/python2.6/site-packages/salt/scripts.py", line 343, in salt_main
    client.run()
  File "/usr/lib/python2.6/site-packages/salt/cli/salt.py", line 175, in run
    self._output_ret(ret, out)
  File "/usr/lib/python2.6/site-packages/salt/cli/salt.py", line 262, in _output_ret
    self._print_docs(ret)
  File "/usr/lib/python2.6/site-packages/salt/cli/salt.py", line 303, in _print_docs
    if ret[host][fun]:
TypeError: string indices must be integers, not str
Traceback (most recent call last):
  File "/usr/bin/salt", line 10, in <module>
    salt_main()
  File "/usr/lib/python2.6/site-packages/salt/scripts.py", line 343, in salt_main
    client.run()
  File "/usr/lib/python2.6/site-packages/salt/cli/salt.py", line 175, in run
    self._output_ret(ret, out)
  File "/usr/lib/python2.6/site-packages/salt/cli/salt.py", line 262, in _output_ret
    self._print_docs(ret)
  File "/usr/lib/python2.6/site-packages/salt/cli/salt.py", line 303, in _print_docs
    if ret[host][fun]:
TypeError: string indices must be integers, not str
```

the patch is is ugly!!! so please fix correctly.
```
            if ret[host] == 'Minion did not return. [Not connected]':
                continue
```

thanks
2015-02-02 13:51:19 -07:00
Ahmed Kamal
96dd7aa578 changing lambda to a full function to please the linter 2015-02-02 22:31:06 +02:00
rallytime
f0577fc50e Pylint fix for the 2014.7 branch 2015-02-02 22:31:05 +02:00
Joseph Hall
b56fc08ea2 Have pylint ignore ssl_match_hostname 2015-02-02 20:06:28 +00:00
Joseph Hall
4451326739 Copy ssl_match_hostname into ext 2015-02-02 19:23:12 +00:00
Nicole Thomas
72f3092395 Merge pull request #20300 from rallytime/pylint_seven
Pylint fix for the 2014.7 branch
2015-02-02 11:19:38 -07:00
rallytime
b26d7c7336 Pylint fix for the 2014.7 branch 2015-02-02 11:18:52 -07:00
Thomas S Hatch
971cfb36a3 Merge pull request #20291 from thatch45/react_fixes
Add id to beacon return data
2015-02-02 03:43:37 -07:00
Thomas S Hatch
eec9ac98e4 lint 2015-02-02 03:42:54 -07:00
Thomas S Hatch
eaff795bdd Add id tot he beacon event dataset 2015-02-02 03:29:54 -07:00
Thomas S Hatch
9b9861076d Add exc_info to the reactor error log 2015-02-02 03:27:15 -07:00
Justin Findlay
8565d7e77a fix arch support for gen_locale
Locale on Arch does not use /usr/share/i18n/SUPPORTED and so the
/usr/share/i18n/locales directory must be inspected for filenames with
the codeset and charmap parts removed from the locale specification.
This partially reverts, but also fixes #20097 for @s0undt3ch.
2015-02-01 18:15:37 -07:00
Justin Findlay
17a6c62f6a add locale specifier parsing utilities 2015-02-01 18:02:41 -07:00
Joseph Hall
1a3e20c699 Merge pull request #20279 from techhat/decodedefault
Change default for decode in http.query()
2015-01-31 15:51:19 -07:00
Joseph Hall
1e4c10b1d8 Change default for decode in http.query() 2015-01-31 12:03:05 -07:00
Thomas S Hatch
b58fe7aaf4 Merge pull request #20273 from techhat/httpclientcert
Add handling for client-side certs to http.query()
2015-01-31 11:14:40 -07:00
Ahmed Kamal
179153d201 Implement freebsd status.netdev 2015-01-31 18:35:55 +02:00
Joseph Hall
bf84d7206b Context is valid in Python 2.7.9 2015-01-31 08:52:29 -07:00
Joseph Hall
04e2b819bd Forgot missing import 2015-01-31 04:50:03 -07:00
Thomas S Hatch
f84249e9e5 Merge pull request #20271 from s0undt3ch/2014.7
Don't try to import non configurable syspath variables
2015-01-31 03:20:55 -07:00
Joseph Hall
394c8a601a Add handling for client-side certs to http.query() 2015-01-30 18:59:10 -07:00
Pedro Algarvio
f1dd99c26f Don't try to import non configurable syspath variables 2015-01-31 00:35:54 +00:00
Mike Place
0e22364a83 Merge pull request #20268 from whiteinge/django-auth-traceback
Prevent Django auth traceback
2015-01-30 16:43:57 -07:00
Mike Place
67ac39ae50 Merge pull request #20226 from thatch45/sudo_call
Allow sudo priv escalation
2015-01-30 16:43:21 -07:00
Seth House
0370bd7bd3 Added a __virtual__ function to the Django auth module 2015-01-30 16:41:50 -07:00
Seth House
8ca6fdaba4 Moved django.contrib.auth import out of module into function
If Django is installed but DJANGO_SETTINGS_MODULE not set the loader
throws a traceback:

Traceback (most recent call last):
  File "/usr/lib/python2.7/dist-packages/salt/loader.py", line 925, in load_modules
    ), fn_, path, desc
  File "/usr/lib/python2.7/dist-packages/salt/auth/django.py", line 54, in <module>
    import django.contrib.auth
  File "/usr/lib/python2.7/dist-packages/django/contrib/auth/__init__.py", line 6, in <module>
    from django.middleware.csrf import rotate_token
  File "/usr/lib/python2.7/dist-packages/django/middleware/csrf.py", line 14, in <module>
    from django.utils.cache import patch_vary_headers
  File "/usr/lib/python2.7/dist-packages/django/utils/cache.py", line 26, in <module>
    from django.core.cache import get_cache
  File "/usr/lib/python2.7/dist-packages/django/core/cache/__init__.py", line 69, in <module>
    if DEFAULT_CACHE_ALIAS not in settings.CACHES:
  File "/usr/lib/python2.7/dist-packages/django/conf/__init__.py", line 54, in __getattr__
    self._setup(name)
  File "/usr/lib/python2.7/dist-packages/django/conf/__init__.py", line 47, in _setup
    % (desc, ENVIRONMENT_VARIABLE))
ImproperlyConfigured: Requested setting CACHES, but settings are not configured. You must either define the environment variable DJANGO_SETTINGS_MODULE or call settings.configure() before accessing settings.
2015-01-30 16:41:33 -07:00
Seth House
68b5f5cd71 Removed unused import 2015-01-30 16:39:29 -07:00
Colton Myers
4318085f7a Merge pull request #20267 from basepi/2015.2releasenotesonly_upgrade
Add only_upgrade to 2015.2 release notes
2015-01-30 16:08:50 -07:00
Colton Myers
ca6ecc0f0f Add only_upgrade to 2015.2 release notes 2015-01-30 16:07:39 -07:00
Mike Place
3dfa6155a9 Merge pull request #20233 from jacksontj/2015.2
Fix scheduler on 2015.2
2015-01-30 14:55:01 -07:00
Thomas Jackson
82a9000617 Fix get() to use correctly named jid 2015-01-30 12:09:05 -08:00
Thomas Jackson
ed804480f9 Remove unused scheduler daemon process 2015-01-30 10:37:44 -08:00
Thomas Jackson
b6741d89b8 Change Master scheduler to use new ClientFuncsDict instaed of runner funcs directly
With the change to forcing all runner calls through low() we forgot about the scheduler which calls functions directly. This adds an API to get that same interface.

Also means we are missing test coverage on the scheduler, since it was non-stop backtracing on the master.
2015-01-30 10:36:09 -08:00
Thomas Jackson
a4b95be0b0 Add option to silence printing 2015-01-30 10:06:21 -08:00
Thomas Jackson
e46281900d Cleanup function calls, if you defualt to the right types, no need for the switch statement 2015-01-30 10:01:57 -08:00
Thomas S Hatch
b37eda267f Merge pull request #20250 from Azidburn/2014.7
Fix for feature request #10258
2015-01-30 10:58:45 -07:00
Thomas S Hatch
bfa6e864f7 lint 2015-01-30 10:49:34 -07:00
Thomas S Hatch
d0a629e721 Merge pull request #20261 from thatch45/basepi-saltssh.errors.20223
Merge #20229 with fixes
2015-01-30 10:36:51 -07:00
Thomas S Hatch
a2a4722906 lint fixes 2015-01-30 10:35:50 -07:00
Thomas S Hatch
68b2773628 Merge branch 'saltssh.errors.20223' of https://github.com/basepi/salt into basepi-saltssh.errors.20223 2015-01-30 10:35:05 -07:00
Thomas S Hatch
9fafe41be0 Merge pull request #20218 from felskrone/fqdn_master_status_2014.7
improved status.master to work with fqdns
2015-01-30 10:31:08 -07:00
Thomas S Hatch
ad6cb8c976 Merge pull request #20260 from thatch45/Jiaion-2014.7
Merge #20241 with fixes
2015-01-30 10:29:12 -07:00
Thomas S Hatch
17829583de lint fixes 2015-01-30 10:27:04 -07:00
Thomas S Hatch
36283d2d65 Merge branch '2014.7' of https://github.com/Jiaion/salt into Jiaion-2014.7 2015-01-30 10:26:42 -07:00
Thomas S Hatch
575edd60d6 Add changes into the minion floscript 2015-01-30 10:25:20 -07:00
Thomas S Hatch
5c94ea377f Merge pull request #20237 from joejulian/2014.7
Issue #20235: blockdev.format fails when succeeding
2015-01-30 10:18:06 -07:00