Commit Graph

70247 Commits

Author SHA1 Message Date
Nicole Thomas
9a856bde82 Whitespace fix for develop (#34016) 2016-06-14 17:01:32 -04:00
Mike Place
12f71338f3 Raise a warning to a user if using Py2 byte-compiled files in Py3 (#34006) 2016-06-14 15:01:48 -04:00
Mike Place
8651df7310 Fix hashlib module for python 3 (#34007) 2016-06-14 15:00:40 -04:00
Mike Place
c429483813 Starting on loader documentation (#33999)
* More work

* More lazyloader docs
2016-06-14 11:23:17 -04:00
Mike Place
1c728b264d Merge pull request #33996 from cachedout/fix_develop_stacktrace
Fix develop stacktrace
2016-06-13 19:56:45 -07:00
Mike Place
2df2844831 Fix unsupported syntax on py2.7
Prevents this stacktace:

mp@silver ...devel/salt/tests % sudo ./runtests.py -h                                                                                                             (git)-[develop]
Traceback (most recent call last):
  File "./runtests.py", line 14, in <module>
    from integration import TestDaemon, TMP  # pylint: disable=W0403
  File "/home/mp/devel/salt/tests/integration/__init__.py", line 62, in <module>
    import salt.minion
  File "/home/mp/devel/salt/salt/minion.py", line 88, in <module>
    import salt.pillar
  File "/home/mp/devel/salt/salt/pillar/__init__.py", line 16, in <module>
    import salt.fileclient
  File "/home/mp/devel/salt/salt/fileclient.py", line 32, in <module>
    import salt.utils.s3
  File "/home/mp/devel/salt/salt/utils/s3.py", line 168
    except (KeyError, ET.ParseError), err:
2016-06-13 20:12:36 -06:00
Mike Place
e797b42ad9 Merge pull request #33989 from thatch45/t_fall
Enable transport fallback
2016-06-13 18:16:21 -07:00
Mike Place
d8d2b2ee9e Merge pull request #33919 from thatch45/cmd_filter
Cmd filter
2016-06-13 18:03:21 -07:00
Mike Place
d3b4daad7f Merge pull request #33973 from rbjorklin/add-consul-pillar-arguments
Dynamically support params in Consul function call
2016-06-13 17:54:04 -07:00
Mike Place
32c4f54ea6 Merge pull request #33889 from hrumph/exit3010
3010 exit codes Remembered for boot session
2016-06-13 17:50:39 -07:00
Mike Place
25657b0844 Merge pull request #33991 from rallytime/cleanup-33982
Clean up boto_sqs module CLI formatting and add version to new funcs
2016-06-13 17:31:48 -07:00
Nicole Thomas
3972dbc773 Lint fix for develop branch (#33992) 2016-06-13 19:50:35 -04:00
Nicole Thomas
840102d624 Protect the vboxapi import more carefully (#33722)
* Protect the vboxapi import more carefully

Fixes #33720

* Pylint fix
2016-06-13 19:25:19 -04:00
rallytime
2348627a51 Clean up boto_sqs module CLI formatting and add version to new funcs
Refs #33982
2016-06-13 17:23:00 -06:00
Tom Williams
5e28dc3158 INFRA-1601 - add several utility functions to boto_sqs module (#33982) 2016-06-13 19:20:10 -04:00
Thomas S Hatch
ebead18ee8 Add support to detect the backend to the factory 2016-06-13 16:47:42 -06:00
Thomas S Hatch
4ad8a04d3b Add detect to zmq/raet filter 2016-06-13 16:46:59 -06:00
Thomas S Hatch
0c4959bb4a if the transport is wrong we should throw a clienterrror 2016-06-13 16:46:15 -06:00
Nicole Thomas
99a936e952 Merge pull request #33977 from rallytime/merge-develop
[develop] Merge forward from 2016.3 to develop
2016-06-13 15:30:30 -04:00
Michael Walton
0ef1e37b00 change possitioning over ..versionadded text 2016-06-13 14:37:40 -04:00
Michael Walton
f5dcf2859a added .. versionadded:: Carbon for new params and functions 2016-06-13 14:25:37 -04:00
Mike Place
d90aa0257a Merge pull request #33906 from lomeroe/archive_unzip_permissions
Archive unzip permissions
2016-06-13 10:21:44 -07:00
Thomas S Hatch
017cb39c5d Adress issues 2016-06-13 11:21:22 -06:00
rallytime
c57bcebaf8 Merge branch '2016.3' into 'develop'
Conflicts:
  - salt/states/boto_lambda.py
2016-06-13 11:18:53 -06:00
Mike Place
ab4fb01475 Merge pull request #33934 from silenius/dns
Add sortlist and options to parse_resolv() in utils/dns.py + pylint issues + refactoring
2016-06-13 10:16:08 -07:00
Mike Place
94a78fe7d7 Merge pull request #33933 from folti/develop
ssh: keep original permissions, when hashing known_hosts
2016-06-13 09:56:29 -07:00
Ferry Schuller
3eb3f52923 Added sanity and logging. (#33935)
* Added sanity and logging.

Added a check if zabbix_sender is installed on the Minion, if not exit.

* Moved code from the global namespace to a function

@rallytime thanks for the suggestions, guess I've fixed them all.

* Moved function zbx() below __virtual__(), for consistency.
2016-06-13 12:44:26 -04:00
Andrew Colin Kissa
ea6c868c74 Add the option to silence output from the X509 create_private_key function (#33943)
* By default the create_private_key function generates
progress status output to stdout, in some cases this
is not convenient as it mixes into the current stdout.

This is due to the underlying M2Crypto's modules
keygen_callback function which writes dots as
progress feedback to stdout

This change adds the ability to silence the output from
the function if you do now what it.

* Added versionadded

Default to True to preserve current behaviour
2016-06-13 12:42:29 -04:00
Mike Place
537c002872 Merge pull request #33944 from mitodl/add_testinfra_modules
Add testinfra modules
2016-06-13 09:41:32 -07:00
Thomas S Hatch
a9c304c73b Merge pull request #33948 from cachedout/optimize_save_load
Save an entire minion cache traversal on each master pub
2016-06-13 09:57:57 -06:00
Mike Place
18df7263ac Merge pull request #33955 from adamchainz/readthedocs.io
Convert readthedocs links for their .org -> .io migration for hosted projects
2016-06-13 08:49:35 -07:00
Aditya Kulkarni
34135e1f67 Add runner for execution modules (#33949)
* Add runner for execution modules

* Make sure all modules load and fix argument passing

* Fix lint error

* Add docs for salt runner
2016-06-13 11:49:26 -04:00
Nicole Thomas
81e16bb93f Merge pull request #33945 from rallytime/merge-2016.3
[2016.3] Merge forward from 2015.8 to 2016.3
2016-06-13 11:44:30 -04:00
Mike Place
b1d03528c0 Merge pull request #33958 from silenius/develop
Add has_ipv6 grains
2016-06-13 08:39:58 -07:00
Mike Place
68d261fe5b Merge pull request #33960 from mecarus/2016.3
Fix mongo get_load to return full mongo record instead of non-existant 'load' key
2016-06-13 08:37:46 -07:00
Mike Place
7ac71466f1 Merge pull request #33965 from rajvidhimar/junos-grains
fix junos_facts grains
2016-06-13 08:31:05 -07:00
Robin Björklin
e69692dd08 Dynamically support params in Consul function call 2016-06-13 17:24:39 +02:00
rajvidhimar
35842ef492 fix junos_facts grains 2016-06-13 11:59:10 +05:30
jacobhammons
8f56406507 Merge pull request #33961 from jacobhammons/release
2016.3.0 known issues update
2016-06-12 20:59:21 -06:00
Jacob Hammons
2cf787d4ba 2016.3.0 known issues update 2016-06-12 20:58:21 -06:00
Michael Walton
edcade5d96 lint fix 2016-06-12 19:48:57 -04:00
Michael Walton
750114a418 Small documentation clarification 2016-06-12 19:15:29 -04:00
Michael Walton
4b407fe4c5 document report_reboot_exit_codes in pkg.py state code 2016-06-12 19:08:11 -04:00
rforkosh
d622133a49 The jid load comes in directly, not as 'load' key. Should return the mongo record directly without accessing keys 2016-06-12 18:01:22 -05:00
Julien Cigar
6f191d8f51 Use ipaddress module, refactoring, fixes some pylint issues, add support for sortlist 2016-06-12 23:16:27 +02:00
Julien Cigar
8651bff4a6 add a grains to indicate whether IPV6 is supported on the host 2016-06-12 21:51:59 +02:00
Adam Chainz
64d9a62f89 Convert readthedocs links for their .org -> .io migration for hosted projects
As per [their blog post of the 27th April](https://blog.readthedocs.com/securing-subdomains/) ‘Securing subdomains’:

> Starting today, Read the Docs will start hosting projects from subdomains on the domain readthedocs.io, instead of on readthedocs.org. This change addresses some security concerns around site cookies while hosting user generated data on the same domain as our dashboard.

Test Plan: Manually visited all the links I’ve modified.
2016-06-11 12:33:37 +01:00
Tobias Macey
20be3b9ceb Add modules for wrapping TestInfra
In order to allow for executing unit tests in the context of salt states
and formulas these modules wrap the Testinfra library and expose its
functionality in familiar salt syntax.

This allows for parameterizing tests using pillar data, tying the tests
into requisite systems, generating events based on test results, and
many other features.
2016-06-11 06:48:48 -04:00
Mike Place
139432fe14 Fix loop over cache in auth checking! 2016-06-10 16:25:04 -06:00
Mike Place
98f3a482ac Save an entire minion cache traversal on each master pub
We were doing an extra and unecessary full traversal of the minion
cache. This refactors all returners and the master to reduce this
to a single call. More work will be forthcoming to reduce this even
further, especially in the context of auth lookups.
2016-06-10 15:43:08 -06:00