Commit Graph

93078 Commits

Author SHA1 Message Date
Jorge Schrauwen
36819172d6 Disable parsable output for zfs/zpool commands
Only very recent zfs on linux supports parsable output for zfs/zpool commands.
Also Oracle ZFS did not implement this at all.

Since we now do value normalization, we can deal with not having parsable output.
2018-04-10 09:12:39 +02:00
Gareth J. Greenaway
438aafeb03
Adding kwargs to calls into file module functions 2018-04-09 19:50:04 -07:00
Gareth J. Greenaway
48ebbdab8a
Update test_pkgrepo.py 2018-04-09 19:40:43 -07:00
Gareth J. Greenaway
0adfee9b11
Updating a couple tests. Fixing check_whitelist_blacklist to work with PY3 when non-iterables are passed. Adding warning about lst_avg results being wrong and future updates in Neon. 2018-04-09 19:38:18 -07:00
Peter Morris
44ecd13abc Update tests to use cmd.run_all 2018-04-10 01:11:03 +01:00
Daniel Wallace
1f69c0d7f8
make sure windows outputs xml junit files 2018-04-09 14:43:15 -05:00
rallytime
8ce21f982c
New "apply_to" kwarg in rabbitmq module should be added at the end
The change in #41233 added the "apply_to" kwarg to rabbitmq.set_policy. Since
the arg was not added at the end of the kwarg list, there was an API change.

In addition, when the order of "apply_to" and "priority" was swapped, the
corresponding kwargs were not changed, which causes a stack trace and the
rabbitmq_policy state to fail.

This change fixes #46880 so that the policy option will work correctly and we
can avoid this API change for the module. In 2017.7.x versions of Salt, the
order of args/kwargs is `vhost`, `name`, `pattern`, `definition`, `priority`,
and then `runas`. Therefore, `apply_to` must be last.

Fixes #46880
2018-04-09 15:19:28 -04:00
Nicole Thomas
133d0986be
Merge pull request #46958 from brejoc/develop-fix-for-grain-test-core
Switch to assertCountEqual since order can change
2018-04-09 14:47:54 -04:00
Nicole Thomas
27d563742b
Merge pull request #46389 from Sygnia/lvresize
linux_lvm module: refactor lvresize
2018-04-09 14:44:47 -04:00
Gareth J. Greenaway
7fb6d28a21
Removing debugging. 2018-04-09 11:38:17 -07:00
Gareth J. Greenaway
f22d91c9d4
Removing suse from pkgrepo comments tests. the pkgrepo functions in SUSE pkg module do not support comments. 2018-04-09 11:24:26 -07:00
rallytime
e3195e587d
Revert changes from #46520 that were not merged-forward correctly
This removes the changes from #46520 that were merged-forward and not handled
correctly in #46907.

Changes to `salt/utils/schedule.py` cannot be merged forward to develop as the
code there has be significantly refactored. The change in #46520 will need to
be applied directly to `develop` instead.
2018-04-09 14:16:02 -04:00
Vasiliy Tolstov
839ed1f950
Merge branch 'develop' into etcd 2018-04-09 20:51:25 +03:00
Vasiliy Tolstov
115bd02cbb returners/etcd: fix lint errors
Signed-off-by: Vasiliy Tolstov <v.tolstov@selfip.ru>
2018-04-09 20:50:25 +03:00
Mike Place
c3bcc27712
Merge pull request #46715 from pakdel/ec2_image_name
Salt Cloud EC2: Image Name
2018-04-09 11:34:58 -06:00
Daniel Wallace
4a2ec1bbb3
support new versions of winrm-fs 2018-04-09 12:12:14 -05:00
Erik Johnson
df43ffdb8f
salt.payload.Serial: fix traceback when unpacking binary blob 2018-04-09 11:35:46 -05:00
Erik Johnson
40a49358c9
gpg renderer: fix tranceback when decrypted ciphertext contains binary data 2018-04-09 11:34:50 -05:00
Erik Johnson
17a88f6a71
Include exc_info in pillar render errors to aid in troubleshooting 2018-04-09 11:33:56 -05:00
Cedric Bosdonnat
cdb1ea3b7f
Merge branch 'develop' into libvirt-events-fix 2018-04-09 18:18:33 +02:00
Mike Place
b23338b838
Tiny grammatical mistake in documentation 2018-04-09 10:13:30 -06:00
Mike Place
b318fe8e99
Merge pull request #46941 from JamesSnow/develop
Fix at.atq support on FreeBSD. This also unbreaks at job creation with at.at.
2018-04-09 10:10:19 -06:00
Mike Place
5279a3a947
Kill extra newline for lint 2018-04-09 10:08:34 -06:00
Rémy Léone
f839c172ec Declare set literally 2018-04-09 17:59:04 +02:00
Amir Pakdel
1a8a7e3841
Merge branch 'develop' into ec2_image_name 2018-04-09 11:49:14 -04:00
Nicole Thomas
9cd07c5f0a
Merge pull request #46957 from cbosdo/libvirt_events_uuids
libvirt_events, harmonize object descriptions
2018-04-09 11:43:45 -04:00
Nicole Thomas
d7c6050e1f
Merge pull request #46794 from jdito/add-route-metrics
Adding the ability to specify a metric for static routes
2018-04-09 11:29:08 -04:00
Nicole Thomas
8c0fc93a4f
Merge pull request #46829 from beornf/handle-vault-exceptions
Exception handling in vault module
2018-04-09 11:27:47 -04:00
rkissos
e790c415d8 update lvresize tests 2018-04-09 16:38:59 +03:00
Nicole Thomas
7d7d40f541
Merge branch '2017.7' into fix_puppet.fact_and_puppet.facts 2018-04-09 09:18:24 -04:00
Nicole Thomas
3cf2353e41
Merge pull request #46945 from vutny/doc-faq-fix-jinja
[DOC] Fix Jinja block in FAQ page
2018-04-09 09:05:27 -04:00
Jochen Breuer
5fa174a4e9
Switch to assertCountEqual since order can change
Since the order of the list in the dict can change, the assertEqual
might fail. assertCountEqual not only checks the count, it also checks
for matching elements regardless of the order. assertCountEqual is
Python=>3.2.
2018-04-09 14:55:47 +02:00
Matt Phillips
3d5e69600b address lint issues raised by @isbm 2018-04-09 08:46:04 -04:00
Cédric Bosdonnat
28be4fa5ea
libvirt_events: align domain lifecycle event with other
Domain lifecycle event was not using the callback provided event type
for the tag, but rather using the realy event. Harmonize this with the
other callbacks
2018-04-09 14:34:28 +02:00
Bo Maryniuk
54933e70e1 Bugfix: key error master_tops_first 2018-04-09 14:16:39 +02:00
Bo Maryniuk
6ae65b8b78 Lintfix: blocked function used 2018-04-09 13:58:03 +02:00
Bo Maryniuk
f55c3d4b12 Lintfix: too many empty lines 2018-04-09 13:57:52 +02:00
Bo Maryniuk
bf41ffbf88 Bugfix: Python3 compat - string required instead of bytes 2018-04-09 13:57:37 +02:00
Cédric Bosdonnat
6b5921dd63
libvirt_events, harmonize object descriptions
Use a dictionary to describe all events objects (domain, network, pool,
nodedev and secret). This allows future extensions of the data
describing these objects.

Also make sure to provide the object UUID where one exists since some
client applications use them to identify objects.
2018-04-09 12:33:02 +02:00
Vasiliy Tolstov
40edca5d8f sdb/etcd: change default port number to IANA assigned
Signed-off-by: Vasiliy Tolstov <v.tolstov@selfip.ru>
2018-04-09 12:42:00 +03:00
Vasiliy Tolstov
d90c9412fc returners/etcd: fix etcd returner
Signed-off-by: Vasiliy Tolstov <v.tolstov@selfip.ru>
2018-04-09 12:40:12 +03:00
Vasiliy Tolstov
a27e3c1101 utils/etcd: change default port number to IANA assigned
Signed-off-by: Vasiliy Tolstov <v.tolstov@selfip.ru>
2018-04-09 12:32:38 +03:00
rkissos
ac5c174096 Merge branch 'lvresize' of https://github.com/Sygnia/salt-1 into lvresize 2018-04-09 11:14:51 +03:00
rkissos
cd21355787 linux_lvm.lvresize module - change return type 2018-04-09 11:14:11 +03:00
Cédric Bosdonnat
4ca6f2c35a
Fix libvirt_events engine running on master
Parameters order is different when firing events on master or minion.
The order for master was wrong. Also added documentation on how to setup
polkit to run the engine on a master node.
2018-04-09 09:51:23 +02:00
Sami Laine
8477465d2a Review comments from @cachedout incorporated. 2018-04-09 10:05:30 +03:00
Gareth J. Greenaway
14d12b1d6b
Remove unused imports. Gating tests so they do not run on Windows 2018-04-08 10:39:49 -07:00
Gareth J. Greenaway
623d96f21a
Adding dummy cron file for integration/states/test_cron 2018-04-08 10:39:48 -07:00
Gareth J. Greenaway
c8e01871d6
Adding an integration test to test cron.file. 2018-04-08 10:39:48 -07:00
Gareth J. Greenaway
ddc55d8f9b
Fixing bug that made cron.file unable to use a file via a Salt URL. 2018-04-08 10:39:48 -07:00