Commit Graph

92973 Commits

Author SHA1 Message Date
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
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
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
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
Daniel Wallace
08e8782f76
Merge pull request #46937 from gtmanfred/2018.3
enable_ssh_minions does not work with subset yet
2018-04-06 21:54:55 -05:00
James Snow
e4e150d4b1 Fix at.atq support on FreeBSD. This also unbreaks at job creation with at.at.
Given:
```
root@minion2:~ # atq
Date                            Owner           Queue   Job#
Fri Apr  6 23:18:00 UTC 2018    root            c       4
root@minion2:~ #
```

Running at.atq on this minion will fail:
```
root@master:~ # salt 'minion2' at.atq

minion2:
    The minion function caused an exception: Traceback (most recent call last):
      File "/usr/local/lib/python3.6/site-packages/salt/minion.py", line 1493, in _thread_return
        return_data = executor.execute()
      File "/usr/local/lib/python3.6/site-packages/salt/executors/direct_call.py", line 28, in execute
        return self.func(*self.args, **self.kwargs)
      File "/usr/local/lib/python3.6/site-packages/salt/modules/at.py", line 110, in atq
        job = tmp[6]
    IndexError: list index out of range
root@master:~ #
```

This patch seems to make it work:
```
root@master:~ # salt 'minion1' at.atq

minion1:
    ----------
    jobs:
        |_
          ----------
          date:
              2018-04-06
          job:
              7
          queue:
              c
          tag:
          time:
              23:42:00
          user:
              root
root@master:~ #
```

Tested against:
```
root@minion1:~ # uname -r
11.1-RELEASE-p9
root@minion1:~ # pkg info | grep salt
py36-salt-2017.7.4_1           Distributed remote execution and configuration management system
root@minion1:~ #
```
2018-04-06 22:51:43 +00:00
Gareth J. Greenaway
8a1f895f18
Merge pull request #46939 from rallytime/stale-config-update
Reduce the number of days an issue is stale by 10
2018-04-06 15:00:01 -07:00
rallytime
5a7c811d46
Reduce the number of days an issue is stale by 10 2018-04-06 15:57:21 -04:00
Daniel Wallace
3fb75e903c
enable_ssh_minions does not work with subset yet
This will fail if it selects the localhost minion as the subset minion.
2018-04-06 14:31:01 -05:00
Daniel Wallace
ac4e7cd73f
Merge pull request #46936 from gtmanfred/2018.3
don't copy __pycache__ or .pyc files for kitchen
2018-04-06 14:15:45 -05:00
Daniel Wallace
91474878fa
don't copy __pycache__ or .pyc files for kitchen 2018-04-06 14:15:02 -05:00
Mike Place
c267709e28
Merge branch 'develop' into add-route-metrics 2018-04-06 13:26:01 -05:00
Mike Place
d41c086abd
Merge branch 'develop' into handle-vault-exceptions 2018-04-06 13:24:42 -05:00
Mike Place
17e5a568bc
Merge pull request #46907 from rallytime/merge-develop
[develop] Merge forward from 2018.3 to develop
2018-04-06 12:34:41 -05:00
Mike Place
4f78903f14
Merge pull request #46919 from boltronics/mysql_module_comparison_fixes
Replace failing is and is not tests with == and !=
2018-04-06 12:34:08 -05:00
Bo Maryniuk
00e66fcbec Get all the code content, not just Python sources 2018-04-06 18:21:31 +02:00
Bo Maryniuk
b2a316fb7a Get code checksum into the shim options 2018-04-06 18:21:19 +02:00
Bo Maryniuk
a54aec2969 Collect digest of the code 2018-04-06 17:38:15 +02:00
Bo Maryniuk
44c5a9000f Bufix: recurse calls damages the configuration (reference problem) 2018-04-06 17:38:15 +02:00
Bo Maryniuk
dca1817d54 Add digest collector for file trees etc 2018-04-06 17:38:15 +02:00
Bo Maryniuk
0e65b32338 Support Python 2.6 versions 2018-04-06 17:38:15 +02:00
Bo Maryniuk
5aef263f74 Properly mock a tempfile object 2018-04-06 17:38:15 +02:00
Bo Maryniuk
a9d0d5ba7e Disable wiping if state is executed 2018-04-06 17:38:15 +02:00
Bo Maryniuk
2a2c48ab7c Initialise the options directly to be structure-ready object. 2018-04-06 17:38:15 +02:00