valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
70,285 Commits 24 Branches 182 Tags 341 MiB
9d049e28e5
Commit Graph

70285 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rallytime
c57bcebaf8 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/states/boto_lambda.py
 2016-06-13 11:18:53 -06:00
Mike Place
8d8ed59b85 Merge pull request #33912 from abalashov/abalashov/fix-schedule-returner-config 
utils/schedule.py:handle_func() - Fix for accessing returner configur…
 2016-06-13 10:18:04 -07: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
rallytime
19d49d94f2 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-06-13 11:13:38 -06: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
Mike Place
a74f1b8077 ZD 762 (#33942) 
* Initial debugging

* Replace the old child jid tracking with psutil investigation of children

* Remove debugging
 2016-06-13 12:43:18 -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
0281d491c6 Merge pull request #33946 from rallytime/bp-33698 
Back-port #33698 to 2015.8
 2016-06-13 08:55:22 -07:00
Mike Place
dff3f51955 Merge pull request #33952 from rallytime/fix-33911 
Add base argument to salt-ssh grains wrapper for filter_by func
 2016-06-13 08:51:33 -07: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
jacobhammons
4a8064918a Adds a "Generated on <timestamp>" line to the footer of each doc html page in the doc (#33962) 2016-06-13 11:24:40 -04: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
rallytime
03b7cbbd2c Add base argument to salt-ssh grains wrapper for filter_by func 
Fixes #33911
 2016-06-10 16:34:31 -06: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
Daniel Hobley
5fdfed1cb9 Make sure we only use GetConnection if we are using a proxy salt minion 2016-06-10 14:16:20 -06:00
Daniel Hobley
1505c5724b Fix a bug with self signed certificates and creating a new VM 
- Removed the GetConnection call as all this does is cause connections that are connected with the overrides for "CERTIFICATE_VERIFY_FAILED" to not be able to connect the 2nd time the si is fetched
 2016-06-10 14:16:14 -06:00
rallytime
b4ab322ce1 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/modules/saltutil.py
 2016-06-10 13:41:53 -06:00
Nicolas Delaby
f806c7e290 [boto_lambda] handle ommitted Permissions parameter (#33908) 
* a bit of pep8

* Don't fail if `Permssions` is None
 2016-06-10 13:31:22 -04:00
Mike Place
b3ec39d644 Correct issue with ping on rotate with minion cache (#33765) 
Only check connected minions if we have the data to do so. Closes #29525
 2016-06-10 13:17:08 -04:00
Mike Place
96d786c9e4 Merge pull request #33858 from rdutch/add_join_domain_state 
Added a join domain state function
 2016-06-10 09:10:37 -07:00
Nicole Thomas
3e0de919c7 Added versionadded to new absolute option (#33937) 
Refs #33918
 2016-06-10 12:08:12 -04:00
Mike Place
e1beac55c5 Merge pull request #33884 from plastikos/issue-33730 
Pass through "greedy" parameter rather than hard-coded "True"
 2016-06-10 08:59:49 -07:00
Mike Place
378dd7ca06 Merge pull request #33888 from jfindlay/random_check 
random.org checks
 2016-06-10 08:45:07 -07:00
Mike Place
16b5e9dcc1 Merge pull request #33896 from DSRCompany/issues/33575_do_not_deep_copy_context 
Don't deep copy context dict values.
 2016-06-10 08:32:54 -07:00
Mike Place
175d3eecb7 Merge pull request #33902 from terminalmage/fix-repack-dictlist 
Add non-strict behavior for repack_dictlist
 2016-06-10 08:28:22 -07:00
Nicole Thomas
2dc1914e7c Add connecting_settings to boto_elb state attributes list (#33936) 
Refs #31499
 2016-06-10 11:28:11 -04:00
Mike Place
29a037dae3 Merge pull request #33909 from xlotlu/patch-1 
fix formulas map.jinja example when using default values
 2016-06-10 08:24:48 -07:00
Mike Place
01323322b0 Merge pull request #33905 from rallytime/bp-33847 
Back-port #33847 to 2016.3
 2016-06-10 08:22:34 -07:00
Mike Place
b9b19b2ca3 Merge pull request #33914 from babilen/salt-api-terminate-cgroup 
Remove KillMode=process from salt-api unit file
 2016-06-10 08:17:39 -07:00
Joseph Hall
91a2184f2d Wait for up to a minute for sync_after_install (#33917) 2016-06-10 11:14:59 -04:00