Commit Graph

94109 Commits

Author SHA1 Message Date
Chris Speidel
f7ac085eb5
minor doc fix in netyang.py 2018-08-09 14:45:40 -04:00
Nicole Thomas
c5f3fd6b2b
Merge pull request #48997 from AVeenstra/patch-1
Python 3 related fix in highstate_return.py
2018-08-09 13:57:51 -04:00
Nicole Thomas
7d6b9ed0a5
Merge pull request #48803 from dmurphy18/aix_filesystems
Support for execution modules and states mount on AIX
2018-08-09 13:51:54 -04:00
Nicole Thomas
2a38905a8a
Merge pull request #48929 from terminalmage/issue48496
2 salt-key fixes
2018-08-09 13:50:06 -04:00
Nicole Thomas
bb9d23bfa1
Merge pull request #49022 from dwoz/47481_docs
Document time format idiosyncrasies
2018-08-09 13:47:11 -04:00
Nicole Thomas
702e76cfc9
Merge branch '2018.3' into issue_48557 2018-08-09 13:47:06 -04:00
Nicole Thomas
9b6a9ff4f1
Merge pull request #48932 from twangboy/fix_win_repo
Fix pkg.install when pkg already installed
2018-08-09 13:45:50 -04:00
Nicole Thomas
d7b7a92ef6
Merge pull request #49011 from rallytime/merge-2018.3
[2018.3] Merge forward from 2017.7 to 2018.3
2018-08-09 13:34:17 -04:00
Nicole Thomas
1db036406b
Merge pull request #49030 from rallytime/update-client-tests
Update netapi client tests
2018-08-09 13:11:14 -04:00
Erik Johnson
163aea71c8
Lint 2018-08-09 11:10:15 -05:00
Erik Johnson
d6e5038022
Fix file.get_diff for remote files
Once the files were cached, the function was still trying to open the
paths passed into it, not the cached paths. This fixes that and adds
additional unit tests.
2018-08-09 10:56:05 -05:00
Nicole Thomas
3325b7d4c0
Merge pull request #48985 from garethgreenaway/48123_file_directory_recurse_fails_broken_symlink
[2018.3] Fix to salt/modules/file.py
2018-08-09 11:03:08 -04:00
Nicole Thomas
c06a3cf531
Merge pull request #49021 from rallytime/merge-2017.7
[2017.7] Merge forward from 2017.7.8 to 2017.7
2018-08-09 10:32:42 -04:00
rallytime
f08ee6c6ae
Update netapi client tests
This change does 2 things:
- Skip 2 tests: they are not actually _testing_ anything, just running functions
  Let's skip these for now until we can dedicate some time to investigate what
  should be tested here. This will also help the tests breath a little bit.
- Add a small sleep to the async test. This test needs a little breathing room so
  the procs don't get stepped on. I think this is what is causing the master to
  shut down sometimes during test runs:

```
08:41:47          test_wheel_async (integration.netapi.test_client.NetapiClientTest)
08:41:47        [CPU:0.0%|MEM:13.2%]  ... 12:41:47,280 [salt.utils.process                         :670 ][ERROR   ] An un-handled exception from the multiprocessing process 'SignalHandlingMultiprocessingProcess-24' was caught:
08:41:47        Traceback (most recent call last):
08:41:47          File "/tmp/kitchen/testing/salt/utils/process.py", line 663, in _run
08:41:47            return self._original_run()
08:41:47          File "/usr/lib/python3.5/multiprocessing/process.py", line 93, in run
08:41:47            self._target(*self._args, **self._kwargs)
08:41:47          File "/tmp/kitchen/testing/salt/client/mixins.py", line 457, in _proc_function
08:41:47            salt.utils.daemonize()
08:41:47          File "/tmp/kitchen/testing/salt/utils/__init__.py", line 514, in daemonize
08:41:47            os.dup2(dev_null.fileno(), sys.stdout.fileno())
08:41:47        io.UnsupportedOperation: fileno
08:41:47        Process SignalHandlingMultiprocessingProcess-24:
08:41:47        Traceback (most recent call last):
08:41:47          File "/usr/lib/python3.5/multiprocessing/process.py", line 249, in _bootstrap
08:41:47            self.run()
08:41:47          File "/tmp/kitchen/testing/salt/utils/process.py", line 663, in _run
08:41:47            return self._original_run()
08:41:47          File "/usr/lib/python3.5/multiprocessing/process.py", line 93, in run
08:41:47            self._target(*self._args, **self._kwargs)
08:41:47          File "/tmp/kitchen/testing/salt/client/mixins.py", line 457, in _proc_function
08:41:47            salt.utils.daemonize()
08:41:47          File "/tmp/kitchen/testing/salt/utils/__init__.py", line 514, in daemonize
08:41:47            os.dup2(dev_null.fileno(), sys.stdout.fileno())
08:41:47        io.UnsupportedOperation: fileno
```
2018-08-09 10:11:20 -04:00
rallytime
02670969d0
Apply fix to ssh init file that was there before merge 2018-08-09 09:53:09 -04:00
rallytime
7e1f7915e4
Revert "Allow for not being prompted to supply a password to deploy keys to a minion with salt-ssh"
This reverts commit a131c9beeb.
2018-08-09 09:50:52 -04:00
rallytime
00416d54d1
Revert "add key-deploy test"
This reverts commit 5b443af7ae.
2018-08-09 09:50:40 -04:00
Travis Paul
d59b6d8269
Add unit test for NetBSD 8 ifconfig changes
lint changes in salt/utils/network.py
2018-08-09 21:26:08 +08:00
Nicole Thomas
d353c02a8c
Merge pull request #49019 from garethgreenaway/47695_fixing_scheduler_bug_when_enabled_is_present
[2018.3] Fix to scheduler when global enabled key is present
2018-08-09 09:06:25 -04:00
Nicole Thomas
a56bc7ffb9
Merge pull request #49023 from The-Loeki/patch-1
Salt SSH appends IdentityFile=agent-forwarding
2018-08-09 08:55:58 -04:00
rallytime
ca82b3d57a
Merge branch '2017.7.8' into merge-2017.7 2018-08-09 08:44:07 -04:00
Nicole Thomas
f73ba21bc7
Merge pull request #49024 from rallytime/fix-deb-test
Fix test error in test_compiler jinja check
2018-08-09 08:43:22 -04:00
Daniel A. Wozniak
2cf80c1595
Fix linter errors 2018-08-08 19:58:30 -07:00
Daniel A. Wozniak
baf291b4c8
Fix file.line line endings 2018-08-08 19:48:41 -07:00
rallytime
a9c16d9137
Fix test error in test_compiler jinja check
The fix in #49002 was incomplete and when run on Debian, it hits a
`ValueError` when the RELEASE variable is a string with a decimal.
This change fixes the error.
2018-08-08 18:29:14 -04:00
Ronald van Zantvoort
8b53571c70
Salt SSH appends IdentityFile=agent-forwarding
When you set `ssh_priv: agent-forwarding` in master.conf (or, untested, `priv: agent-forwarding` in roster), SSH agent authentication is supposed to be used.

However, Salt SSH launches with `ssh -o IdentityFile=agent-forwarding`. 
This file/dir can't be found (doh) and the connection fails.
2018-08-08 23:49:22 +02:00
Daniel A. Wozniak
313a3d93d6
Document time format idiosyncrasies 2018-08-08 14:45:40 -07:00
Gareth J. Greenaway
aff1b8f6d4
Lint. 2018-08-08 14:33:25 -07:00
rallytime
c6f8429e41
Merge branch '2017.7.8' into '2017.7'
No conflicts.
2018-08-08 17:18:22 -04:00
Nicole Thomas
6b6d68c615
Merge pull request #49020 from rallytime/fix-grains-test
Make grains integration test more robust
2018-08-08 16:59:18 -04:00
AVeenstra
0e535f2c8c
Unpacking dict with the six iterator 2018-08-08 21:55:31 +02:00
Nicole Thomas
2ddba6391a
Merge pull request #49010 from Ch3LL/univention
Add univention OS to debian os_family mapping
2018-08-08 15:44:03 -04:00
Nicole Thomas
4590494b50
Merge pull request #48981 from Ch3LL/mac_runas_quote
Add warning to mac runas docs about escaping characters
2018-08-08 15:43:42 -04:00
Nicole Thomas
92d6c25c7f
Merge pull request #49002 from rallytime/skip-jinja-deep-error-test
Skip test_jinja_deep_error on Debian 8
2018-08-08 15:18:38 -04:00
rallytime
f72a3ac6be
Make grains integration test more robust
The `test_grains_append_val_already_present` test can be flaky, especially on
CentOS 7 when it gets bogged down. Let's give the test a little breathing room
by adding a sleep so the grains.append calls don't stack up too quickly.
2018-08-08 14:58:05 -04:00
Gareth J. Greenaway
8935c08141
Fixing a bug that occurs if the "enabled" key is present in the scheduler items dictionary. Adding a test to ensure scheduler runs as expected when that key is present. 2018-08-08 11:44:13 -07:00
Nicole Thomas
41bd36842e
Merge pull request #48636 from terminalmage/loader-fixes
Properly handle optimized .pyc files in loader in PY3
2018-08-08 14:20:59 -04:00
David Murphy
92818f816b Fixes for testing 2018-08-08 12:15:59 -06:00
David Murphy
77dd7a1743 Adjust unit tests 2018-08-08 12:15:59 -06:00
David Murphy
eaed033cde Updated for review comments and adjusted locking when writing files 2018-08-08 12:15:59 -06:00
David Murphy
5bf9e6085b Update due to review comments 2018-08-08 12:15:59 -06:00
David Murphy
9fb5641dc7 Mount unit tests for modules and states for AIX 2018-08-08 12:15:59 -06:00
David Murphy
b28f427432 Save off work after laptop issue 2018-08-08 12:15:59 -06:00
David Murphy
e5c2741fe7 module and states mount support for AIX 2018-08-08 12:15:59 -06:00
David Murphy
b701e16ad0 Further updates to support for mount on AIX 2018-08-08 12:15:59 -06:00
David Murphy
210076276f Initial support for handling /etc/filesystems on AIX 2018-08-08 12:15:59 -06:00
twangboy
075ea29d29
remove .lower(), fix debug messages 2018-08-08 12:10:40 -06:00
rallytime
c26fa0d6c4
Mark orchestration test as expensive 2018-08-08 13:38:09 -04:00
rallytime
fceb6d8d6f
Update old utils paths to use new paths 2018-08-08 13:35:30 -04:00
rallytime
3e6445a9d6
Merge branch '2017.7' into '2018.3'
Conflicts:
  - doc/man/salt-api.1
  - doc/man/salt-call.1
  - doc/man/salt-cloud.1
  - doc/man/salt-cp.1
  - doc/man/salt-key.1
  - doc/man/salt-master.1
  - doc/man/salt-minion.1
  - doc/man/salt-proxy.1
  - doc/man/salt-run.1
  - doc/man/salt-ssh.1
  - doc/man/salt-syndic.1
  - doc/man/salt-unity.1
  - doc/man/salt.1
  - doc/man/salt.7
  - doc/man/spm.1
  - salt/beacons/log.py
  - salt/client/ssh/__init__.py
  - salt/modules/cmdmod.py
  - salt/utils/win_functions.py
  - tests/integration/modules/test_cmdmod.py
  - tests/integration/netapi/rest_tornado/test_app.py
  - tests/integration/runners/test_state.py
2018-08-08 13:31:57 -04:00