Denys Havrysh
bfdf54e61d
[DOC] Fix Jinja block in FAQ page
...
Closes #18835
2018-04-08 12:19:48 +03: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
Gareth J. Greenaway
f3f42146ca
Removing expected from strftime and hashsum tests since the results are always different and we are only concerned about the filter being available.
2018-04-06 13:19:11 -07:00
Gareth J. Greenaway
860234c045
Fixing lint.
2018-04-06 13:19:11 -07:00
Gareth J. Greenaway
0891c6b580
fixing docstring
2018-04-06 13:19:10 -07:00
Gareth J. Greenaway
c8945e4b2e
cleaning up some imports.
2018-04-06 13:19:10 -07:00
Gareth J. Greenaway
0599759e5b
cleaning up some test doc strings.
2018-04-06 13:19:10 -07:00
Gareth J. Greenaway
dceda5eb88
Moving all jinja filter tests into support/jinja_filters.py. Updaitng integration/ssh/test_jinja_filters.py to use those tests. Adding integration/modules/test_state_jinja_filters.py to also use the common jinja filter tests.
2018-04-06 13:19:10 -07:00
Gareth J. Greenaway
07d7e3ca01
Adding a new integration test and corresponding state files to test availabilty of jinja filters when using salt-ssh.
2018-04-06 13:19:10 -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
Bo Maryniuk
65ffabc1c3
Fix unit tests for minor version removal of namespaced version-specific directory
2018-04-06 17:38:15 +02:00
Bo Maryniuk
6c94c105e0
Bugfix: remove minor version from the namespaced, version-specific directory
2018-04-06 17:38:14 +02:00
Michael Calmer
41e8ef8e82
require same major version while minor is allowed to be higher
2018-04-06 17:38:14 +02:00
Bo Maryniuk
cd32f14406
Re-phrase docstring for alternative Salt installation
2018-04-06 17:38:14 +02:00
Bo Maryniuk
448944a317
Rephrase Salt SSH doc description
2018-04-06 17:38:14 +02:00
Bo Maryniuk
60872d1441
Fix unit test for catching "supported-versions" was written down
2018-04-06 17:38:14 +02:00
Bo Maryniuk
97fab18f60
Add unit test for get_supported_py_config function ext tops
2018-04-06 17:38:14 +02:00
Bo Maryniuk
96d83dac63
Add unit test for get_supported_py_config function base tops
2018-04-06 17:38:14 +02:00
Bo Maryniuk
a284d73e1f
Add unit test for get_supported_py_config function typecheck
2018-04-06 17:38:14 +02:00
Bo Maryniuk
f833d18fd1
Get supported Python executable based on the config py-map
2018-04-06 17:38:14 +02:00
Bo Maryniuk
d26e7317b1
Write all supported minimal python versions into a config file on the target machine
2018-04-06 17:38:14 +02:00
Bo Maryniuk
38295d7633
Make the command more readable
2018-04-06 17:38:14 +02:00
Bo Maryniuk
dadf38ca1e
Lintfix: PEP8 extra-line needed
2018-04-06 17:38:14 +02:00
Bo Maryniuk
87990d303e
Fix typo
2018-04-06 17:38:14 +02:00
Bo Maryniuk
a0dd7a76e0
Add documentation about updated Salt SSH features
2018-04-06 17:38:14 +02:00
Bo Maryniuk
650d5fe5fc
Lintfix
2018-04-06 17:38:14 +02:00
Bo Maryniuk
87b9a16b74
Add unit test for an alternative version pack
2018-04-06 17:38:14 +02:00
Bo Maryniuk
5119ff1b73
Fix docstring
2018-04-06 17:38:14 +02:00
Bo Maryniuk
5186f047ce
Add shareable module to the gen_thin unit test
2018-04-06 17:38:14 +02:00
Bo Maryniuk
82d25b180b
Add unit test for tree addition to the archive
2018-04-06 17:38:14 +02:00
Bo Maryniuk
1252657407
Move tarfile.open check to the end of the test
2018-04-06 17:38:14 +02:00
Bo Maryniuk
380bc4e21c
Mock-out missing methods inside gen_thin
2018-04-06 17:38:13 +02:00
