valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
70,256 Commits 24 Branches 182 Tags 341 MiB
15ecb083e3
Commit Graph

70256 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bo Maryniuk
15ecb083e3 Add test for the first in line from platform.node is used (mostly) 2016-06-14 16:29:06 +02:00
Bo Maryniuk
eed433ec60 Add unit test to check on duplicate hostnames in the pool 2016-06-14 16:29:06 +02:00
Bo Maryniuk
71a3e91f57 Add unit test for check if the minion ID is distinct in the pool 2016-06-14 16:29:06 +02:00
Bo Maryniuk
873811c1aa Make generate_minioin_id more testable. 2016-06-14 16:29:06 +02:00
Bo Maryniuk
35740ce4fa Get hostname as an attribute of a raw socket. 2016-06-14 16:29:06 +02:00
Bo Maryniuk
a3266c6f2f Fix network test for Solaris 2016-06-14 16:29:06 +02:00
Bo Maryniuk
2d4a9939a9 Rename network unit test into a proper name 2016-06-14 16:29:06 +02:00
Bo Maryniuk
c357a80038 Use FQDN at last, as it may differ 2016-06-14 16:29:06 +02:00
Bo Maryniuk
043ae8bd92 Use api of the distinct list 2016-06-14 16:29:06 +02:00
Bo Maryniuk
cf1433b8e1 Rewrite generate_minion_id function 2016-06-14 16:29:06 +02:00
Bo Maryniuk
49aa659bd5 Fix logical expression 2016-06-14 16:29:05 +02:00
Bo Maryniuk
d8a912ccdf Keep order on deduplication 2016-06-14 16:29:05 +02:00
Bo Maryniuk
6d21f50a73 Remove hostname sorting 2016-06-14 16:29:05 +02: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