valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 00:55:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
82,417 Commits 24 Branches 182 Tags 341 MiB
8dbb93851d
Commit Graph

82417 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
8dbb93851d Merge pull request #42087 from redmatter/fix-dockerng-volume-present-result-2017.7 
Make result=true if Docker volume already exists
 2017-07-17 13:41:47 -05:00
Mike Place
c84d6db548 Merge pull request #42186 from rallytime/fix-42166 
Use long_range function for IPv6Network hosts() function
 2017-07-17 13:39:35 -05:00
Mike Place
e7b79e0fd2 Merge pull request #42210 from terminalmage/issue40928-2017.7 
Only pass a saltenv in orchestration if one was explicitly passed (2017.7)
 2017-07-17 13:22:38 -05:00
Mike Place
0e49021b0e Merge pull request #42236 from cloudflare/napalm-provider 
New option for napalm proxy/minion: provider
 2017-07-17 13:19:55 -05:00
Mike Place
3ec5bb1c2f Merge pull request #42257 from twangboy/win_unit_pillar_test_git 
Fix `unit.pillar.test_git` for Windows
 2017-07-17 12:51:41 -05:00
Mike Place
36395625c2 Merge pull request #42258 from twangboy/win_unit_states_tests_environ 
Fix `unit.states.test_environ` for Windows
 2017-07-17 12:50:37 -05:00
Mike Place
894bdd2b19 Merge pull request #42265 from rallytime/gate-moto-version 
Gate boto_elb tests if proper version of moto isn't installed
 2017-07-17 12:47:51 -05:00
Mike Place
baf04f2a2d Merge pull request #42277 from twangboy/win_unit_states_test_winrepo 
Fix `unit.states.test_winrepo` for Windows
 2017-07-17 12:37:06 -05:00
Mike Place
be6b211683 Merge pull request #42309 from terminalmage/fix-versionadded 
Change "TBD" in versionadded to "2017.7.0"
 2017-07-17 12:11:44 -05:00
Mike Place
acd29f9b38 Merge pull request #42206 from rallytime/fix-flaky-test 
[PY3] Fix test that is flaky in Python 3
 2017-07-17 12:09:52 -05:00
Mike Place
8f1cb287cf Merge pull request #42126 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2016.11 to 2017.7
 2017-07-17 12:07:18 -05:00
Erik Johnson
603f5b7de6 Change "TBD" in versionadded to "2017.7.0" 2017-07-14 10:21:33 -05:00
twangboy
ed89cd0b93 Use os.sep for path seps 2017-07-12 10:13:26 -06:00
rallytime
78cdee51d5 Gate boto_elb tests if proper version of moto isn't installed 
For Python 2 tests, we can use an older version. But when running
these tests of Python 3, we need a newer version of moto that supports
Python 3.

This gates the tests if the expected version of moto is missing.
 2017-07-11 17:00:50 -06:00
twangboy
55b278c478 Mock the reg.read_value function 2017-07-11 13:23:11 -06:00
twangboy
45be32666a Add error-handling function to shutil.rmtree 2017-07-11 13:08:00 -06:00
Mircea Ulinic
1ac69bd737 Document the provider option and rearrange the doc 2017-07-11 14:44:51 +00:00
Mircea Ulinic
4bf4b14161 New option for napalm proxy/minion: provider 
This option will turn very handy for environemnts when the user
requires a library with a different name than napalm-base (eventually
on top of the public lib). The sole requirement right now is to
preserve the get_network_driver function. However, this can be enhnaced
even from this perspective later, if really needed.
 2017-07-10 20:29:35 +00:00
garethgreenaway
81695a9f3c Merge pull request #42234 from Ch3LL/fix_cloud_rc 
[2017.7] parse libcloud rc version correctly
 2017-07-10 11:58:55 -07:00
Ch3LL
5aedac46b7 [2017.7] parse libcloud rc version correctly 2017-07-10 12:37:22 -04:00
garethgreenaway
0580f2e2b2 Merge pull request #42208 from terminalmage/ensure-json-string 
Fix another instance where json.loads needs a string
 2017-07-07 11:14:36 -07:00
Erik Johnson
771ade5d73 Only pass a saltenv in orchestration if one was explicitly passed (2017.7) 
Also, only pass pillarenv if explicitly passed. _get_opts() in the state
module will apply the correct saltenv (if applicable) when no explicit
saltenv/pillarenv is passed.
 2017-07-07 11:40:53 -05:00
Erik Johnson
db9b51199a Fix another instance where json.loads needs a string 2017-07-07 11:04:16 -05:00
rallytime
2be4865f48 [PY3] Fix test that is flaky in Python 3 
We can't rely on lists having the same order in Python3 the same
way we rely on them in Python2. If we sort them first, and then
compare them, this test will be more reliable.
 2017-07-07 09:43:52 -06:00
rallytime
b8bcc0d599 Add note to various network_hosts docs about long_run for IPv6 networks 2017-07-06 17:36:18 -06:00
garethgreenaway
41ef5225e9 Merge pull request #42184 from terminalmage/py3-tests 
importlib: Use load_module() instead of exec_module() to initialize loaded mods
 2017-07-06 16:04:01 -07:00
garethgreenaway
47ade9e91c Merge pull request #42088 from terminalmage/update-mocking 
Update mocking in network tests
 2017-07-06 15:03:42 -07:00
rallytime
11862743c2 Use long_range function for IPv6Network hosts() function 
Previous implementation used xrange, which requires that the range
fit in a C long data type. Given that an IPv6 subnet is massive,
the ``salt.ext.ipadress.IPv6Network.hosts()`` function would stacktrace
with an OverflowError due to the use of xrange. However, ``/64`` is a
common netmask.

This PR uses the ``long_range`` function for the ``IPv6Network.hosts()``
function instead of ``xrange``.

While the funciton will no longer stacktrace on large IPv6 subnets, the user
should be aware that these large subnets will take a very long time to list.

Fixes #42166
 2017-07-06 15:03:54 -06:00
Erik Johnson
e639be8b47 importlib: Use load_module() instead of exec_module() to initialize loaded mods 
Using exec_module() results in some unexpected behavior in the LazyLoader,
so more investigation will need to be done before we can use it. In the
meantime, this commit uses load_module() instead. It also gets rid of
the now-unnecessary workarounds we had recently instituted in salt-ssh
to work around issues with the __opts__ dunder.
 2017-07-06 15:02:44 -05:00
Nicole Thomas
2ae5517d36 Merge pull request #42022 from terminalmage/issue41996 
salt.modules.dockermod: ensure that json.loads is fed a string
 2017-07-06 12:27:16 -06:00
garethgreenaway
778ed74103 Merge pull request #42147 from dmurphy18/fix_gnupgv21_for_20177 
Refine support for gnupg v2.1 for 2017. 7 branch
 2017-07-06 08:41:17 -07:00
Nicole Thomas
bbbf05a16d Merge pull request #42133 from garethgreenaway/42127_schedule_always_trigger_change_fix 
2017.7.0 modules/schedule.py fix
 2017-07-05 16:01:44 -06:00
garethgreenaway
fc74332242 Merge pull request #42130 from terminalmage/issue42116-2017.7 
Fix regression in CLI pillar override for salt-call (2017.7 branch)
 2017-07-05 14:57:57 -07:00
garethgreenaway
2df5d3b6c2 Merge pull request #42134 from terminalmage/pr-42094-2017.7 
Prevent command from showing in exception when output_loglevel=quiet (2017.7 branch)
 2017-07-05 14:56:31 -07:00
garethgreenaway
723738bab2 Merge pull request #42139 from terminalmage/revert-37222 
Revert "decode pillar on minion side on receiving"
 2017-07-05 14:54:37 -07:00
David Murphy
379e3db4c3 Refine support for gnupg v2.1 to 2017.7 branch 2017-07-05 15:33:41 -06:00
Nicole Thomas
afc19048bd Merge pull request #42131 from gtmanfred/release 
Add stuff to release notes
 2017-07-05 13:33:14 -06:00
Erik Johnson
05549addaf Revert "decode pillar on minion side on receiving" 
This reverts commit 6130722df3.
 2017-07-05 14:19:30 -05:00
Erik Johnson
e764c98277 Prevent command from showing in exception when output_loglevel=quiet 
When a command is being executed using salt.utils.timed_subprocess.TimedProc,
and that command does not exist in the PATH, it will result in an
OSError/IOError being raised. We catch this and then raise a
CommandExecutionError with some information, including the command being
run. However, when output_loglevel=quiet, we don't want any details of
the command to be visible.

This commit redacts the command details in these corner cases.
 2017-07-05 12:53:28 -05:00
Gareth J. Greenaway
2f96aada7c Removing code that was previously in place to account for a situation where we backed up the value of the original seconds parameter in the event that the splay paramter was included. Recent changes made this code no long necessary, so removing it and simply deleting the "_seconds" parameter from the schedule list output. 2017-07-05 10:29:37 -07:00
Daniel Wallace
e2b3160c96 fix up PR 2017-07-05 10:41:26 -06:00
Daniel Wallace
6fbde35d11 add note about roster_defaults 2017-07-05 10:23:07 -06:00
Daniel Wallace
ea5ae2e468 add release note about about extmod blacklist and whitelist 2017-07-05 10:23:07 -06:00
Daniel Wallace
db0ed458d8 Update salt-master first before updating salt-minion 
Fixes #42124
 2017-07-05 10:23:07 -06:00
Erik Johnson
d15f7ded82 Add integration test for 42116 2017-07-05 11:07:38 -05:00
Erik Johnson
c312e10cf9 Fix regression when CLI pillar override is used with salt-call 2017-07-05 11:03:27 -05:00
Nicole Thomas
9197055ea5 Merge pull request #42084 from terminalmage/assert-called-once 
Fix usage of assert_called_once in Python 3 < 3.6
 2017-07-05 09:22:39 -06:00
rallytime
8b35b367b3 Merge branch '2016.11' into '2017.7' 
Conflicts:
  - salt/modules/win_pkg.py
  - salt/states/dockerng.py
 2017-07-05 09:14:30 -06:00
Erik Johnson
4780d7830a Merge pull request #42078 from damon-atkins/fix_convert_flt_str_version_on_cmd_line 
pkg.install and pkg.remove fix version number input.
 2017-07-05 01:04:56 -05:00
Mike Place
46d575acbc Merge pull request #42105 from Ch3LL/update_rc 
Update releasecanddiate doc with new 2017.7.0rc1 Release
 2017-07-03 22:14:41 -05:00