valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
68,259 Commits 24 Branches 182 Tags 341 MiB
80e9d1d278
Commit Graph

68259 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bo Maryniuk
e191f338c7 Cleanup code 2016-06-11 15:00:33 +02: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
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
5fe889c7f1 Don't call os.getppid() on Windows 
Fixes #33927
 2016-06-10 10:34:24 -06:00
Mike Place
6b98e8a9ea Merge pull request #33880 from terminalmage/zh744 
pkg.uptodate: Pass kwargs to pkg.list_upgrades
 2016-06-10 09:00:14 -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
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
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
cb88960ed1 Merge pull request #33904 from rallytime/bp-33806 
Back-port #33806 to 2015.5
 2016-06-10 08:21:14 -07:00
Joseph Hall
91a2184f2d Wait for up to a minute for sync_after_install (#33917) 2016-06-10 11:14:59 -04:00
Bo Maryniuk
80f45defae Implement packages and patterns gathering 2016-06-10 10:04:12 +02:00
Bo Maryniuk
ad45a265f5 Add Debian support for the repo generator 2016-06-10 01:16:06 +02:00
Bo Maryniuk
6280ad137e Semifix: sometimes SQLite3 is locked. TODO: a proper handling required. 2016-06-10 01:15:34 +02:00
Bo Maryniuk
51567ab61d Implement SUSE repositories export 2016-06-10 00:26:42 +02:00
Bo Maryniuk
e4ac113927 Add Kiwi support to the collector/inspector 2016-06-10 00:08:50 +02:00
Bo Maryniuk
eceeb4ecf2 Add ability to specify an additional PID file 2016-06-10 00:08:28 +02:00
Bo Maryniuk
f522a91ac6 Add ISO/image build (stub) and export to the Kiwi 2016-06-10 00:08:04 +02:00
Bo Maryniuk
bb19684606 Add Kiwi processor exception 2016-06-10 00:07:08 +02:00
Bo Maryniuk
805e2ce204 Add Kiwi exported (initial) 2016-06-10 00:06:49 +02:00
Mike Place
261baeb5b5 Ensure tht pillar have freshest grains (#33910) 2016-06-09 14:13:10 -04:00
Alex Balashov
b5a4f8b313 utils/schedule.py:handle_func() - Fix for accessing returner configuration attributes 'return_config' and 'return_kwargs'. 
They are specified as 'return_config' and 'return_kwargs' in the documentation, and those are the member names used elsewhere in the code base. However, this code previously referenced 'returner_kwargs' and 'returner_config', so returners from scheduled jobs were not appropriately called in situations in which configuration parameters to override default minion config needed to be provided to the schedule module.

Resolves issue #33868 (https://github.com/saltstack/salt/issues/33868).
 2016-06-09 14:05:36 -04:00
Seth House
b6ebd7b6ef Add docs for arg/kwarg eauth matching 
This adds documentation for the addition in #29153.
 2016-06-09 09:13:02 -06:00
Mike Place
638ccf501d Work around upstream cherrypy bug 
Refs https://github.com/cherrypy/cherrypy/issues/1444
 2016-06-09 09:09:10 -06:00
Nicole Thomas
00e016ecfc Add note about Xenial packages to 2016.3.0 release notes (#33870) 
Refs #32761
 2016-06-09 10:52:16 -04:00
Nicole Thomas
ef6da0be5d Merge pull request #33877 from rallytime/merge-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2016-06-09 10:50:42 -04:00
Adam Mendlik
1046279cb7 Document sudo policy for gitfs post-recieve hook 
Because the hook is run as the user performing the push,
salt-call will typically fail. This documentation change
uses sudo for salt-call, and provides a sudo policy that
permits any user to run the post-recieve hook.
 2016-06-09 07:10:12 -06:00
Dmitry Kuzmenko
8e34d0a9c3 Don't deep copy context dict values. 2016-06-09 11:49:18 +03:00
Justin Findlay
6acee3cc30 modules.random_org._query: only return text if present 2016-06-08 20:47:39 -06:00
Justin Findlay
82f95429db modules.random_org unit tests: skip if random.org down 2016-06-08 20:46:20 -06:00
Justin Findlay
1f9422e0cd utils.http.query: also except gaierror with tornado 2016-06-08 20:46:20 -06:00
Justin Findlay
06f249901a add 2016.3.1 release notes (#33883) 2016-06-08 16:49:28 -06:00
rallytime
398534a9e7 Fix ret return from merge-conflict resolution 2016-06-08 16:16:19 -06:00
Erik Johnson
ea726d11c8 pkg.uptodate: Pass kwargs to pkg.list_upgrades 
This resolves an edge case in which the "fromrepo" argument is passed to
the pkg.uptodate state. We pass through the kwargs to pkg.upgrade, but
do not pass the same kwargs to list_upgrades, resulting in inconsistent
results.
 2016-06-08 17:07:24 -05:00
Erik Johnson
de90b35d2b salt/modules/zypper.py: add fromrepo support to list_upgrades 2016-06-08 16:41:43 -05:00
Erik Johnson
35fbb06df5 salt/modules/win_pkg.py: add kwargs to list_upgrades 
This is done for API compatibility
 2016-06-08 16:41:32 -05:00
Erik Johnson
bf5505f425 salt/modules/solarisips.py: add kwargs to list_upgrades 
This is done for API compatibility
 2016-06-08 16:41:25 -05:00
Erik Johnson
6e89a8be98 salt/modules/pkgutil.py: add kwargs to list_upgrades 
This is done for API compatibility
 2016-06-08 16:41:17 -05:00
Erik Johnson
5179dbcec4 salt/modules/pacman.py: add kwargs to list_upgrades 
This is done for API compatibility
 2016-06-08 16:41:10 -05:00
Erik Johnson
46e5a52784 salt/modules/macports.py: add kwargs to list_upgrades 
This is done for API compatibility
 2016-06-08 16:41:01 -05:00
Erik Johnson
76143b76ca salt/modules/ebuild.py: add kwargs to list_upgrades 
This is done for API compatibility
 2016-06-08 16:40:52 -05:00
Erik Johnson
b40fc9bc62 salt/modules/brew.py: add kwargs to list_upgrades 
This is done for API compatibility
 2016-06-08 16:40:07 -05:00
Erik Johnson
4f11c16d86 salt/modules/aptpkg.py: add fromrepo support to list_upgrades 2016-06-08 16:28:17 -05:00
rallytime
b8e4706074 Merge branch '2015.5' into '2015.8' 
Conflicts:
  - salt/modules/saltutil.py
  - salt/states/archive.py
 2016-06-08 14:26:18 -06:00
Nicole Thomas
be20ce1bbf Merge pull request #33866 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-06-08 15:49:56 -04:00
rallytime
595d4f2ac3 Fixup new groupadd tests for syntax change in 2016.3 2016-06-08 12:42:52 -06:00