valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
83,791 Commits 24 Branches 182 Tags 341 MiB
5a63ed7449
Commit Graph

83791 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
garethgreenaway
24905ff5d8 Merge pull request #42249 from rallytime/docstring-fix 
Add get_driver function used with libcloud modules to doc exception list
 2017-07-11 11:07:04 -07:00
Daniel Wallace
3fb1b8e596 Merge branch 'develop' into gpg 2017-07-11 10:59:30 -06:00
Berthet
eabb17665f Merge branch 'develop' into vberthet-xen-ignore-ssl 2017-07-11 18:35:03 +02:00
Berthet
b779cae19f Fix Lint error 2017-07-11 18:34:30 +02:00
garethgreenaway
7d50e4c077 Merge branch 'develop' into patch-6 2017-07-11 09:23:32 -07:00
Daniel Wallace
593ccedc00 fix signature versionadded release 2017-07-11 09:27:50 -06:00
rallytime
7e0c099ab3 Add get_driver function used with libcloud modules to doc exception list 
Fixes failing valid_docs test in develop
 2017-07-11 09:13:38 -06:00
Nicole Thomas
827347bcf3 Merge pull request #42229 from shengis/add_dns_for_azurearm 
add custom dns support for azurearm provider
 2017-07-11 09:08:45 -06:00
Mircea Ulinic
1ac69bd737 Document the provider option and rearrange the doc 2017-07-11 14:44:51 +00:00
Alexandru Bleotu
346b1880e3 Merge branch 'develop' into jinja_globals_gh 2017-07-11 10:33:06 +01:00
shengis
e95316b145 Merge branch 'develop' into add_dns_for_azurearm 2017-07-10 23:01:52 +02:00
Aurelien Fusil-Delahaye
8f96b45833 fix using isinstance 2017-07-10 22:58:21 +02: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
Nicole Thomas
a94b7ce72c Merge branch 'develop' into patch-6 2017-07-10 11:56:29 -06:00
Nicole Thomas
c554ab2a5b Merge pull request #42224 from tdutrion/develop 
Remove duplicate instruction in Openstack Rackspace config example
 2017-07-10 11:02:31 -06:00
Ch3LL
5aedac46b7 [2017.7] parse libcloud rc version correctly 2017-07-10 12:37:22 -04:00
Aurélien FUSIL-DELAHAYE
e37097b802 spaces removed for lint 2017-07-10 16:08:19 +02:00
Aurélien FUSIL-DELAHAYE
340368fdac add custom dns support for azurearm provider 
- added option in documentation : dns_servers
 2017-07-10 13:35:08 +02:00
Thomas Dutrion
6144af034a
Remove duplicate instruction in Openstack Rackspace config example 2017-07-09 11:34:14 +02:00
Nicole Thomas
3451da9437 Merge pull request #42201 from shengis/add_cloud_event_for_azurearm 
add destroying and destroy cloud events to azurearm provider
 2017-07-07 15:34:44 -06:00
Nicole Thomas
5337581328 Lint: Remove extra spaces between name and } 2017-07-07 14:23:14 -06:00
Daniel Wallace
ce6b05d237 add release note 2017-07-07 13:15:30 -06:00
Daniel Wallace
2dac634dd2 add document for winrm_verify_ssl 2017-07-07 13:15:30 -06:00
Daniel Wallace
2ae6fed88a allow not verifying ssl winrm saltcloud 
Required for Self Signed Certs on pywinrm>=0.2.1
 2017-07-07 13:15:28 -06:00
Mike Place
e0c4a4bb1b Merge pull request #42192 from rallytime/merge-develop 
[develop] Merge forward from 2017.7 to develop
 2017-07-07 13:59:30 -05:00
Jay
f0cd6be122 Update service.py 
Fixed errors from salt-pr-lint-n test.
 2017-07-07 14:24:45 -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
Nicole Thomas
f87b7ced6f Merge pull request #42053 from jlayze/patch-4 
Update win_service.py
 2017-07-07 10:32:15 -06:00
rallytime
bf45c18f9d Convert remaining "assert_called_once" references to new syntax 
These tests are new to develop and need to be converted to use the new
assert_called_once syntax introduced in #42084.
 2017-07-07 10:28:19 -06:00
Jay
1d55e02405 Update service.py 
Fixed no return if no delay. (Lines 125-126)
 2017-07-07 12:18:02 -04:00
Erik Johnson
db9b51199a Fix another instance where json.loads needs a string 2017-07-07 11:04:16 -05:00
Jay
f1f729e7f3 Add delay option to beacons/service.py 2017-07-07 11:49:46 -04: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
Andres Montalban
7e3164c050 Fix Augeas state documentation example 2017-07-07 12:04:24 -03:00
Aurélien FUSIL-DELAHAYE
1911fcda4b add destroying and destroy cloud events to azurearm provider 2017-07-07 16:52:43 +02:00
rallytime
8d960d463a Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/grains/core.py
 2017-07-06 17:42:30 -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
Jay
623ca64121 Merge branch 'develop' into patch-4 2017-07-06 16:58:53 -04: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
Nicole Thomas
b869ae5579 Merge pull request #42101 from rallytime/haproxyconn-tests 
[PY3] Fix haproxyconn unit tests that are failing
 2017-07-06 12:17:46 -06:00
Mike Place
8fdf7cfcef Merge pull request #42102 from rallytime/py3-kernelpkg-tests 
[Py3] Use functools.cmp_to_key with sorted instead of cmp kwarg
 2017-07-06 12:07:52 -05:00
Nicole Thomas
df1ed8929d Merge pull request #42109 from arthurlogilab/patch-20 
[doc] Update aws.rst - add Debian default username
 2017-07-06 10:58:25 -06:00
Mike Place
30f04a7224 Merge pull request #42138 from rallytime/py3-saltmod-tests 
[PY3] Make test_saltmod unit tests less flaky for Python 3
 2017-07-06 11:47:20 -05:00
Mike Place
5f1eca086b Merge pull request #42149 from rallytime/stale-config-update 
Reduce the number of days an issue is stale by 25
 2017-07-06 11:45:17 -05:00