valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
75,737 Commits 24 Branches 182 Tags 341 MiB
f7f7b987b3
Commit Graph

75737 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mrten
43bef5fbb9 sqlite is not found in 2015.8 (#37549) 
* sqlite is not found in 2015.8 

first appearance is boron

* Update sqlite3.py

change boron to 2016.3.0. as requested
 2016-11-08 14:09:51 -07:00
Nicole Thomas
2e8e56ca69 [PY3] Change log.warn statements to log.warning (#37531) 
* [PY3] Change log.warn statements to log.warning

log.warn is deprecated in Python 3. This change removes the
occurance of deprecation warnings for using log.warn. For example:

```
17:24:23 [WARNING ] /testing/salt/utils/verify.py:522: DeprecationWarning: The 'warn' method is deprecated, use 'warning' instead
17:24:23   log.warn('Insecure logging configuration detected! Sensitive data may be logged.')
17:24:23
17:24:23 [WARNING ] Insecure logging configuration detected! Sensitive data may be logged.
```

* Tweak unit.utils.verify_test to using warning instead of warn
 2016-11-08 13:06:54 -07:00
rallytime
5ead1425d7 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - doc/topics/releases/releasecandidate.rst
  - salt/modules/win_servermanager.py
 2016-11-08 13:04:33 -07:00
Nicole Thomas
453319b50a Don't pass the vpc id to boto.vpc.create_internet_gateway func (#37556) 
That function's namespace looks like this:
```
def create_internet_gateway(self, dry_run=False):
```
So when we pass in the vpc_id opbject in the test, the check later
in the function sets `dry_run=True` since the vpc_id opbject exists.

This later throws JSONResponseErrors because the `DryRun` flag is
set. This error raising functionality was added in the most recent
version of moto, which exposed this bug.

This fixes the three boto_vpc_test unit state tests. We'll see if
other tests need to be addressed in other files on a full test run.
 2016-11-08 12:48:26 -07:00
Tobias Macey
b01686e94d Fix parameter handling for boto_rds with boto3 
The way that optional parameters are handled forces some of them to be
defined even when that is not necessary. Updated handling to use a
mapping of snake_case to CamelCase names and only include defined
parameters in the call to boto for the `create` and `modify` actions.
 2016-11-08 12:24:36 -05:00
Eric Radman
4cd92980d8 Use 'driver' instead of 'provider' in test cloud configs (#37547) 
Running the tests currently provokes a warning from
salt/config/__init__.py:│2275 ("'provider' will be
deprecated in the Nitrogen release")
 2016-11-08 09:50:39 -07:00
Jonathan Ballet
89b9417605 Documentation rendering fixes (#37543) 
* doc: fix documentation rendering of salt.runners.survey

* doc: fix Sphinx documentation warnings
 2016-11-08 09:42:12 -07:00
herbert.buurman
68f445f197 Added pillar_enc variable to orchestrate to be passed through 2016-11-08 12:47:30 +01:00
Mike Place
72b4292a79 Merge pull request #37537 from cachedout/matcher_unit_tests 
Additional unit tests
 2016-11-08 23:01:02 +13:00
Mike Place
610a198322
Lint 2016-11-08 19:40:48 +13:00
Mike Place
3e848ad126
Cache tests 2016-11-08 18:49:10 +13:00
Mike Place
e13cee7d70 Merge pull request #37532 from The-Loeki/opt-backend 
Backend config: Propagate usage, deprecate requests_lib
 2016-11-08 16:33:33 +13:00
Mike Place
efef3948ad
Add unit tests for minion targeting 2016-11-08 16:27:36 +13:00
Mike Place
96b8b9a849 Merge pull request #37457 from rallytime/fix-31081 
Fixup file.line docs to be more clear and consistent
 2016-11-08 13:29:20 +13:00
Mike Place
8b0f280998 Merge pull request #37509 from Rumbles/rumbles 
Saltstack PPA is no longer maintained - update docs
 2016-11-08 13:27:14 +13:00
Mike Place
6d2b2e1881 Slight grammar fix 2016-11-08 13:27:06 +13:00
Mike Place
221f84399d Merge pull request #37518 from Tanoti/elasticsearch_returner_improvements 
Improvements and fixes to elasticsearch returner
 2016-11-08 13:24:34 +13:00
Mike Place
7de790ffed Merge pull request #37526 from twangboy/fix_35799 
Remove loop from dsc.apply_config
 2016-11-08 13:23:11 +13:00
Mike Place
94811df2ea Merge pull request #37534 from rallytime/bp-merge-foward-fix 
Back-port fix needed from #37515
 2016-11-08 13:14:46 +13:00
Mike Place
17adbb0c9f Merge pull request #37533 from whiteinge/salt-api-504-timeouts 
Return a 504 response instead of 500 for Salt timeouts
 2016-11-08 13:14:15 +13:00
Ronald van Zantvoort
cb445550a6 typofix 2016-11-08 01:13:12 +01:00
Mike Place
a9f03eee6f Merge pull request #37529 from lorengordon/bp-36736 
Backport: PR 36736 to 2016.3
 2016-11-08 13:04:10 +13:00
Erik Johnson
d1b2af1d69 Add missing source_hash_name args to a couple funcs 
file.check_managed and file.check_managed_changes both were missing this
new argument. This commit adds it in all places where these functions
are used.
 2016-11-07 16:26:25 -07:00
Nicole Thomas
2f6bb3325f Merge pull request #37515 from rallytime/merge-carbon 
[carbon] Merge forward from 2016.3 to carbon
 2016-11-07 16:24:34 -07:00
Seth House
63226aeda6 Return a 504 response instead of 500 for Salt timeouts 2016-11-07 16:23:17 -07:00
Ronald van Zantvoort
217523653f StormPath state: take backend as param for httperrors, deprecate requests_lib:True 2016-11-08 00:07:43 +01:00
Mike Place
19475aada6 Merge pull request #37519 from rallytime/returner-load-errors 
Update returner __virtual__() return messages for loader
 2016-11-08 12:06:22 +13:00
Mike Place
c2984a9c9c Merge pull request #37521 from genuss/fix_refresh_pillar 
refresh_pillar() should be called always with refresh=True during saltutil.sync_all
 2016-11-08 12:05:52 +13:00
Mike Place
a6ae2b90d9 Merge pull request #37524 from The-Loeki/opt-backend 
http.query(): Properly deprecate 'requests_lib' and honor 'backend'
 2016-11-08 12:04:49 +13:00
Mike Place
fefdfab850 Merge pull request #37527 from rallytime/fix-35016 
Add syndic_id=None kwarg to save_minions funcs in returners
 2016-11-08 12:04:03 +13:00
Ronald van Zantvoort
5523417b52 backend:requests - adapt Cloud Azure 2016-11-07 23:51:00 +01:00
twangboy
fc4260911c Remove unnecessary format 2016-11-07 15:38:07 -07:00
Daniel Wallace
b77b6bae02 fix Lithium to 2015.5.0 (#37530) 2016-11-07 15:35:48 -07:00
m03
21c2664b6a Fix issue 36679 win_servermanager failure 2016-11-07 17:21:23 -05:00
Nicole Thomas
7e8ffeb03a Merge pull request #16 from terminalmage/pr-37515 
Add missing source_hash_name args to a couple funcs
 2016-11-07 15:20:35 -07:00
Erik Johnson
465622bc0e Add missing source_hash_name args to a couple funcs 
file.check_managed and file.check_managed_changes both were missing this
new argument. This commit adds it in all places where these functions
are used.
 2016-11-07 16:16:58 -06:00
Ronald van Zantvoort
ae4e86ccc2 modify docs to utilize backend:requests 2016-11-07 22:28:32 +01:00
rallytime
2944b244aa Add syndic_id=None kwarg to save_minions funcs in returners 
Fixes #35016
 2016-11-07 14:26:01 -07:00
Ronald van Zantvoort
002497ec54 http.query(): typofix 2016-11-07 22:15:49 +01:00
twangboy
c934a2bfa7 Remove the loop from apply_config 2016-11-07 14:10:09 -07:00
Ronald van Zantvoort
9ec22c66a4 http.query(): Properly deprecate 'requests_lib' and honor 'backend' 2016-11-07 21:41:52 +01:00
rallytime
25821bb8db Clarify which modes use "before", "after", and "indent" options 
This clarification was added both the the file.line module and
file.line state docs.
 2016-11-07 12:19:29 -07:00
Nicole Thomas
ffa4631765 Merge pull request #37517 from rallytime/merge-develop 
[develop] Merge forward from 2016.11 to develop
 2016-11-07 11:26:09 -07:00
Nicole Thomas
79362244ff Merge pull request #37516 from rallytime/merge-2016.11 
[2016.11] Merge forward from carbon to 2016.11
 2016-11-07 10:02:23 -07:00
rallytime
021cfe3fd5 Pylint fixes 2016-11-07 10:01:27 -07:00
Nicole Thomas
743164844d Merge pull request #37514 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-11-07 09:51:06 -07:00
rallytime
fb261a31f3 Update returner __virtual__() return messages for loader 
Refs #37444 and #37502
 2016-11-07 09:15:44 -07:00
Alexey Genus
3f4c33906e refresh_pillar() should be called always 2016-11-07 19:14:08 +03:00
Tanoti
3599a8d661 Improvements and bug fixes: 
- Ensure all keys in nested dicts under the data payload have dots replaced with underscores and store original key for reference
- Replace use of config.option execution module which does not support ":" path syntax with salt.returners.get_returner_options() so config options are actually obtained
- Fixed use of datetime module in date_index mode so functions are loaded properly
 2016-11-07 15:39:25 +00:00
rallytime
2e68da3e52 Merge branch '2016.11' into 'develop' 
Conflicts:
  - doc/topics/cloud/vmware.rst
  - salt/cloud/clouds/vmware.py
 2016-11-07 08:22:17 -07:00