Erik Johnson
58e16a0d39
Account for trimmed value in 'salt -d' output
2017-02-02 18:06:50 -06:00
Erik Johnson
56e86a6e04
Run test_valid_docs in batches
...
This test fails often due to being trimmed, thanks to
salt.utils.dicttrim trimming values > max_event_size.
This commit changes this test so that it runs sys.doc twice, ensuring
that the return from sys.doc (for now) is not trimmed.
2017-02-02 18:06:50 -06:00
Erik Johnson
6221fd0573
Add tests for pillar decryption
2017-02-02 18:06:50 -06:00
Erik Johnson
aa6bd51b6b
Add Pillar Decryption info to Nitrogen release notes
2017-01-31 11:25:58 -06:00
Erik Johnson
18a58b2b63
Document pillar decryption feature in pillar docs
2017-01-31 11:25:58 -06:00
Erik Johnson
dec7cbf9c5
Add documentation on pillar decryption config items
2017-01-31 11:25:56 -06:00
Erik Johnson
894f365090
Update master config template with pillar decryption args
2017-01-31 11:24:09 -06:00
Erik Johnson
55f7dafad8
Decrypt pillar data at end of pillar compilation
2017-01-31 11:24:09 -06:00
Erik Johnson
d1fbdd7940
Add pillar_enc support to CLI pillar in pillar.items
2017-01-31 11:24:09 -06:00
Erik Johnson
8b979ab674
Rework minion-side pillar decryption for state subsystem
2017-01-31 11:24:09 -06:00
Erik Johnson
8c936666bf
Add salt.utils.crypt
2017-01-31 11:24:09 -06:00
Erik Johnson
a34be54fc2
Add a new config option for list of available pillar decryption renderers
...
Also rename the option which specifies the default, to reduce confusion.
2017-01-31 11:24:09 -06:00
Erik Johnson
558c72f64a
salt.utils: add default value for "default" in traversal funcs
2017-01-31 11:24:09 -06:00
Erik Johnson
322a9d84c2
Add new config params for pillar decryption
2017-01-31 11:24:04 -06:00
Erik Johnson
83bde29810
Decrypt pillar override before it is passed to Pillar object
...
This allows pillar override to be available in an unencrypted state
during pillar compilation instead of clumsily bolting it on after the
fact.
2017-01-31 11:22:52 -06:00
Nicole Thomas
11a99d8be0
[develop] Update release numbers for doc build ( #39041 )
2017-01-30 15:51:40 -07:00
lomeroe
781c15de1c
correct issue when running get with return_not_configured=True ( #38666 )
...
lint indentation fixes
2017-01-30 12:18:14 -07:00
Mike Place
ac0021e506
Merge pull request #38498 from doublescoring/fix-2016.11-38451-develop
...
[38451] Fix file.replace to make it suitable to python 3
2017-01-30 11:22:41 -07:00
Nicole Thomas
7fa89303a1
Merge pull request #39026 from rallytime/merge-develop
...
[develop] Merge forward from 2016.11 to develop
2017-01-30 10:39:18 -07:00
Julien BONACHERA
1e06f388bb
make openvswitch state work with python3 ( #38873 )
...
* openvswitch: add a basic unit test for openvswitch
* openvswitch: enclose comments_* variables into a map
* openvswitch: only prepare error messages if type parameter is present
* openvswitch: add test case: create a GRE port
* openvswitch: remove trailing whitespace
* openvswitch: add missing "comments" variable
* openvswitch: pep8 compliance
* openvswitch: mock dig.check_ip
* openvswitch: rename "type" argument into "tunnel_type"
* openvswitch: reference bridge_exists before assignment
* openvswitch: reference port_list before assignment
* openvswitch: add upgrade note about "type" option renaming
2017-01-30 09:56:10 -07:00
Mike Place
191a1e55ae
Merge pull request #39006 from rallytime/python3-fixes
...
Various Python 3 compatibility fixes
2017-01-30 09:54:28 -07:00
Mircea Ulinic
c26e331588
mine.update only on certain functions (#38874 )
...
* `mine.update` only on certain functions
* mine.update docstring for mine_functions karg
2017-01-30 09:44:47 -07:00
Mike Place
b90ffaf1f7
Merge pull request #39019 from terminalmage/fix-broken-runner
...
Fix improperly-designed runner
2017-01-30 09:32:29 -07:00
Mike Place
984e6de244
Merge pull request #39024 from moio/minionswarm-set-machine-id
...
minionswarm.py: allow random machine id
2017-01-30 09:31:15 -07:00
Nicole Thomas
c95d1e5a31
Some small spelling fixes for vault docs ( #39029 )
...
Refs #39001
2017-01-30 09:30:48 -07:00
Mike Place
80e4aa2ea2
Merge pull request #39022 from moio/minionswarm-reuse-existing-data
...
minionswarm.py: allow temporary data reuse
2017-01-30 09:29:30 -07:00
Daniel Mota Leite
27d173f318
salt: update vault documentation to better explain how to use it ( #39001 )
2017-01-30 09:25:00 -07:00
Mike Place
5b0ed18df6
Merge pull request #39023 from moio/minionswarm-predictable-random
...
minionswarm.py: use predictable random numbers
2017-01-30 09:24:40 -07:00
rallytime
8928436bdd
Merge branch '2016.11' into 'develop'
...
Conflicts:
- salt/pillar/__init__.py
2017-01-30 09:06:27 -07:00
Silvio Moioli
f454dbd84c
minionswarm.py: use predictable random numbers
2017-01-30 16:34:01 +01:00
Silvio Moioli
f27e0e8f4e
minionswarm.py: allow random machine id
2017-01-30 14:21:52 +01:00
Silvio Moioli
382cf21b5f
minionswarm.py: allow re-use of temporary files
2017-01-30 13:23:45 +01:00
Silvio Moioli
b2f7d3e3cf
minionswarm.py: add option to specify temp dir
2017-01-30 13:23:45 +01:00
Erik Johnson
15b4087fee
Fix improperly-designed runner
...
This runner tries to kill the Salt process if it cannot load the
3rd-party Python module on which it relies. This is unacceptable.
This commit modifies the runner by adding a __virtual__ function and
providing a graceful failure condition for the loader.
It also makes some coding style guideline fixes.
2017-01-30 01:51:54 -06:00
Erik Johnson
e70904c480
Merge pull request #39012 from terminalmage/invalid-lexer
...
Fix "invalid lexer" errors in docs build
2017-01-28 00:47:44 -06:00
Erik Johnson
868001baac
Fix "invalid lexer" errors in docs build
2017-01-28 00:46:36 -06:00
Nicole Thomas
cea0f32936
Merge pull request #39003 from rallytime/merge-2016.11
...
[2016.11] Merge forward from 2016.3 to 2016.11
2017-01-27 17:09:09 -07:00
rallytime
1fd2b6e63d
[PY3] Convert minion_ret dict to list
...
This syntax allows both Python2 and Python3 to work. The .keys() function
in Python3 does not return a list, it returns a `dict_keys` view, which
does not support indexing.
2017-01-27 15:20:31 -07:00
rallytime
fc3c9182ae
[PY3] Fix find module unit tests
...
These unit tests exposed a bunch of python 3 incompatibilities in the
filebuffer util as well as the find util. The filebuffer changes should
be reviewed carefully.
2017-01-27 14:59:24 -07:00
rallytime
b0631ce005
[PY3] Fix timezone module unit tests
...
When writing to a file, the string needs to be converted to bytes first.
2017-01-27 12:15:39 -07:00
rallytime
76e95087fd
Merge branch '2016.3' into '2016.11'
...
No conflicts.
2017-01-27 11:52:03 -07:00
Mike Place
79b6fa5cc4
Merge pull request #38935 from plassa-b/diskusage_beacon_regex
...
beacons.diskusage: regular expression handling
2017-01-27 10:19:43 -07:00
Mike Place
58543d5cbf
Merge pull request #38908 from bobrik/show-changes-for-serialize
...
Deprecate show_diff for file.serialize to mimic file.managed, closes #38853
2017-01-27 10:15:36 -07:00
Mike Place
da96221741
Merge pull request #38951 from DSRCorporation/bugs/37938_fix_depends_decorator_memleak
...
Keep the only one record per module-function in depends decorator.
2017-01-27 10:05:42 -07:00
Mike Place
4b75dfac95
Merge pull request #38978 from sjorge/2016.11-bootstrap
...
fixes saltstack/salt-bootstrap#1021
2017-01-27 10:05:09 -07:00
Mike Place
85165edb70
Merge pull request #38982 from rallytime/fix-34780
...
Set response when using "GET" method in s3 utils
2017-01-27 10:04:47 -07:00
Mike Place
cfdbc99e12
Merge pull request #38989 from alprs/docfix-state_pt3_environ
...
Documentation: fix SLS in environment variable examples
2017-01-27 10:00:07 -07:00
Mike Place
b40f369d98
Merge pull request #38991 from isbm/isbm-zypper-state-unknown-pkg-crash
...
Isbm zypper state unknown pkg crash
2017-01-27 09:59:37 -07:00
Mike Place
e934ae8d86
Merge pull request #38993 from raazvvann/dev/rheghedu/system-comments
...
system: fix system.set_computer_desc
2017-01-27 09:58:57 -07:00
Mike Place
55e4d2572e
Merge pull request #39000 from rallytime/skip-badload-test
...
Skip the test_badload test until Jenkins move is complete
2017-01-27 09:58:20 -07:00
