valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
91,868 Commits 24 Branches 182 Tags 341 MiB
cf44199305
Commit Graph

7811 Commits

Author SHA1 Message Date
Nicole Thomas
889293cf37
Merge pull request #46494 from rallytime/merge-develop 
[develop] Merge forward from 2018.3 to develop
 2018-03-12 16:26:43 -04:00
rallytime
651dcaff66
Merge branch '2018.3' into 'develop' 
Conflicts:
  - tests/integration/states/test_file.py
 2018-03-12 11:53:21 -04:00
Michael A. Smith
13cc08d67c
AWSKMS Decrypt: Fix PY3 Bytestring Errors 2018-03-10 16:49:50 -05:00
Michael A. Smith
f9793a3d52
AWSKMS Decrypt: Refactor for AWS Profile Support 2018-03-10 16:49:32 -05:00
Michael A. Smith
909f09c666
Add a KMS Envelope-Encryption Renderer 2018-03-10 16:49:31 -05:00
Nicole Thomas
9c089aa4de
Merge pull request #46421 from bdrung/skip-ssh-tests-if-ssh-is-missing 
Skip SSHPasswordTests if ssh binary is not found
 2018-03-09 11:21:01 -05:00
Benjamin Drung
3d37eca847 Fix various spelling mistakes 
lintian found various spelling mistakes.

Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>
 2018-03-08 19:14:42 +01:00
Nicole Thomas
b74c41611f
Merge branch 'develop' into kapacitor_enhancements 2018-03-08 10:47:58 -05:00
Ahmed AbouZaid
42f4f9e219 add env to cmd_mock 2018-03-08 10:51:11 +01:00
Ahmed AbouZaid
820a399fd3 fix dbrps assert 2018-03-08 10:20:35 +01:00
Erik Johnson
4798187035
Improve reliability/idempotence of file.blockreplace state (2018.3 branch) 
This makes the following changes:

- The `append_newline` argument to the `file.blockreplace`
  remote-execution function has been modified so that if its value is
  `None`, it only appends a newline when the content block does not end
  in one.
- A couple of fixes were made to newline handling. The existing code
  normalized the newlines in the content block, replacing them with
  os.linesep. However, when the file contains newlines that don't match
  the OS (i.e. POSIX newlines in a file on a Windows box, or Windows
  newlines on a Linux/Mac/BSD/etc. box), then we would still end up with
  mixed newlines. The line separator is now detected when we read in the
  original file, and the detected line separator is used when writing
  the content block. Additionally, the same newline mismatch was
  possible when appending/prepending the content block. This has been
  fixed by using a common function for appending, prepending, and
  replacing the content block.
- Support for the `append_newline` argument has been added to the
  `file.blockreplace` state. The default value for the state is `None`.
  A `versionchanged` has been added to the remote execution function to
  let users know that the Fluorine release will change the default value
  of that variable.
- 20 new integration tests have been written to test the
  `file.blockreplace` state.
 2018-03-07 22:29:09 -06:00
Ahmed AbouZaid
0a9d87b42f
pylint compliance 2018-03-08 02:43:40 +01:00
Ahmed AbouZaid
f8d824092a add dbrps to main kapacitor test 2018-03-08 01:35:02 +01:00
Nicole Thomas
04a0c94c3d
Merge pull request #46402 from rallytime/merge-develop 
[develop] Merge forward from 2018.3 to develop
 2018-03-07 12:50:30 -05:00
Benjamin Drung
3d6f658309 Skip SSHPasswordTests if ssh binary is not found 
If the ssh binary is not found in path, SSHPasswordTests will fail:

ERROR: test_password_failure (unit.ssh.test_ssh.SSHPasswordTests)
[CPU:0.0%|MEM:54.9%]
----------------------------------------------------------------------
Traceback (most recent call last):
  File "tests/unit/ssh/test_ssh.py", line 42, in test_password_failure
    client = ssh.SSH(opts)
  File "salt/client/ssh/__init__.py", line 226, in __init__
    raise salt.exceptions.SaltSystemExit('No ssh binary found in path -- ssh must be '
salt.exceptions.SaltSystemExit: None

Either SSHPasswordTests needs to be converted into a real unit test
(i.e. mocking the salt call) or this tests needs to be skipped if ssh is
not available.

Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>
 2018-03-07 16:36:06 +01:00
Mihai Dinca
b5e508f339 Fix openscap push 2018-03-07 14:55:50 +01:00
rallytime
ddbeef85cd
Merge branch '2018.3' into 'develop' 
Conflicts:
  - salt/payload.py
  - salt/utils/schedule.py
 2018-03-06 16:57:33 -05:00
Gareth J. Greenaway
80a45a6b89
More lint fixes 2018-03-05 14:54:00 -08:00
Gareth J. Greenaway
2a68fa968e
Couple lint fixes. 2018-03-05 14:54:00 -08:00
Gareth J. Greenaway
abeb2bc143
Fixing test_search_keys. Gating tests to ensure GPG module is available. 2018-03-05 14:54:00 -08:00
Gareth J. Greenaway
0eba7ca9b1
Fixing test. 2018-03-05 14:53:59 -08:00
Gareth J. Greenaway
a9fb0c7a58
removing unused test. 2018-03-05 14:53:59 -08:00
Gareth J. Greenaway
6636f63c15
Initial addition of some unit tests for gpg module. 2018-03-05 14:53:59 -08:00
Nicole Thomas
a3ad308457
Merge pull request #46263 from terminalmage/issue46212 
Add setopt support to yumpkg (and pkg.installed state)
 2018-03-05 14:43:19 -05:00
Nicole Thomas
6bb0a310f9
Merge pull request #46304 from garethgreenaway/quick_fix_scheduler_unit_tests 
[develop] quick fix to unit.utils.test_schedule.ScheduleTestCase.test_eval_schedule_time_eval
 2018-03-05 14:40:26 -05:00
Nicole Thomas
8ec1c6699b
Merge branch 'develop' into state.exists 2018-03-05 10:38:21 -05:00
Nicole Thomas
de308848f9
Merge pull request #46321 from amendlik/pkgng-upgrade 
Account for output variations in pkgng._parse_upgrade
 2018-03-05 10:30:16 -05:00
Adam Mendlik
26322e990a
Account for output variations in pkgng._parse_upgrade 2018-03-03 11:48:10 -07:00
Ronald van Zantvoort
47f82c6f39
Merge branch 'develop' into docker-prune 2018-03-03 18:52:30 +01:00
Nicole Thomas
241611aca5
Merge pull request #46307 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2018.3.0rc1 to 2018.3
 2018-03-03 07:56:06 -05:00
Erik Johnson
e8b940242c
Add unit test for docker.prune 2018-03-03 01:47:00 -06:00
Gareth J. Greenaway
15ca7a21c2
Fixing merge conflict. 2018-03-02 14:20:32 -08:00
Erik Johnson
61ab47ee70
Merge branch '2017.7' into merge-2017.7-2018.3 
Conflicts:
- salt/cloud/clouds/openstack.py
- salt/daemons/masterapi.py
- salt/master.py
- salt/modules/gentoo_service.py
- salt/pillar/__init__.py
- salt/pillar/git_pillar.py
- salt/runners/cache.py
- salt/runners/git_pillar.py
- salt/runners/winrepo.py
- salt/utils/docker/__init__.py
- salt/utils/gitfs.py
 2018-03-02 16:20:20 -06:00
rallytime
c9fa21f62c
Merge branch '2018.3.0rc1' into '2018.3' 
No conflicts.
 2018-03-02 14:22:07 -05:00
Nicole Thomas
5ffa482343
Merge pull request #46285 from gtmanfred/2018.3.0rc1 
fix return dict for salt-ssh if something goes wrong
 2018-03-02 12:17:42 -05:00
Nicole Thomas
5416fcf6dc
Merge pull request #46275 from terminalmage/issue46274 
Make sure rest_cherrypy's config is all str types on PY2
 2018-03-02 12:15:33 -05:00
Erik Johnson
aeeb533225
Fix master conf test for PY3 
PY3 should have no non-unicode strings, this was a bug in the test
 2018-03-02 11:06:13 -06:00
rallytime
ed46ce3c74
Merge branch '2018.3' into 'develop' 
Conflicts:
  - salt/auth/ldap.py
  - salt/modules/zfs.py
  - salt/modules/zpool.py
  - salt/states/cmd.py
  - salt/utils/schedule.py
  - tests/integration/scheduler/test_eval.py
  - tests/integration/scheduler/test_postpone.py
  - tests/unit/grains/test_core.py
 2018-03-02 11:55:06 -05:00
Daniel Wallace
417e45686b
add unit test 2018-03-02 07:48:26 -07:00
Dmitry Kuzmenko
51c311bc1c
Payload Py3 fix and set handling. 2018-03-02 06:01:42 +03:00
Gareth J. Greenaway
dcc5deaea5
Porting #46084 to Develop 2018-03-01 16:02:21 -08:00
Erik Johnson
2f7ae45088
Add conf file unicode test for master 2018-03-01 13:43:33 -06:00
Nicole Thomas
dc2833aa87
Merge branch '2018.3.0rc1' into bugs/46202_msgpack_custom_types_rework 2018-03-01 10:47:07 -05:00
Dmitry Kuzmenko
a664864ab1
Rework msgpack serialization of unsupported types in serial 2018-03-01 02:16:31 +03:00
Nicole Thomas
da60399b8f
Merge pull request #46183 from oeuftete/fix-docker-container-running-host-config-ulimits 
Fix docker_container.running HostConfig Ulimits comparison
 2018-02-28 17:22:11 -05:00
Nicole Thomas
7382654c70
Merge pull request #46227 from Ch3LL/smtp_file_client 
Mock file_client call in smtp return test
 2018-02-28 17:12:22 -05:00
Erik Johnson
17e454bf04
Add setopt support to yumpkg (and pkg.insalled state) 2018-02-28 14:10:45 -06:00
Dmitry Kuzmenko
4dfc44ac39
A basic fix for loading datetime objects with msgpack 2018-02-28 23:05:51 +03:00
Nicole Thomas
a97a3e6fb0
Merge pull request #46101 from jfindlay/openrc_ret 
In OpenRC exec module, make sure to ignore retcode on status
 2018-02-28 15:01:36 -05:00
Nicole Thomas
123625213e
Merge pull request #46232 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-02-28 14:16:36 -05:00