valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
91,351 Commits 24 Branches 182 Tags 341 MiB
7f326c0c17
Commit Graph

12490 Commits

Author SHA1 Message Date
Nicole Thomas
7f326c0c17
Merge pull request #46204 from rallytime/merge-develop 
[develop] Merge forward from 2018.3 to develop
 2018-02-27 10:22:52 -05:00
rallytime
379e33cb3c
Lint fix: remove unused import 2018-02-27 10:14:35 -05:00
rallytime
6927642321
Merge branch '2018.3' into 'develop' 
Conflicts:
  - doc/conf.py
  - salt/modules/cmdmod.py
  - salt/utils/schedule.py
  - tests/integration/scheduler/test_eval.py
 2018-02-26 14:23:06 -05:00
Dmitry Kuzmenko
21673ea4eb
Postgress module unit test fix. 2018-02-26 21:50:13 +03:00
Nicole Thomas
6c67741544
Merge pull request #45855 from sjorge/zfsutils 
zfs/zpool refactor
 2018-02-26 11:50:33 -05:00
Nicole Thomas
605e5eff73
Merge pull request #46161 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-02-26 10:29:38 -05:00
Simon Dodsley
b0403be0fa Add module for Pure Storage FlashBlade array 2018-02-24 09:03:38 -05:00
Jorge Schrauwen
dd29778ed5 Phase 3 - Cleanup tests 2018-02-24 13:37:43 +01:00
Jorge Schrauwen
8517e876e4 Phase 2 - salt.states.zfs tests 2018-02-24 13:37:43 +01:00
sjorge@acheron.be
f4bcf5fa71 Phase 2 - salt.states.zpool tests 2018-02-24 13:37:43 +01:00
Super-User
fce3920b07 Phase 1 - salt.modules.zpool tests 2018-02-24 13:37:42 +01:00
Super-User
e7e902662b Phase 1 - salt.modules.zfs tests 2018-02-24 13:37:42 +01:00
Super-User
7b32faa0ce Phase 0 - salt.utils.zfs tests 2018-02-24 13:37:42 +01:00
rallytime
69ac94baca
Update utils paths 2018-02-24 06:55:09 -05:00
rallytime
cffbf52c10
Lint fix: remove extra line 2018-02-24 06:51:25 -05:00
rallytime
79bed6cff1
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/modules/cmdmod.py
  - salt/modules/reg.py
  - salt/modules/win_lgpo.py
  - salt/modules/win_path.py
  - salt/modules/win_pkg.py
  - salt/pillar/file_tree.py
  - salt/states/boto3_route53.py
  - salt/states/reg.py
  - salt/utils/win_functions.py
  - tests/unit/modules/test_kubernetes.py
  - tests/unit/modules/test_win_path.py
 2018-02-23 09:50:19 -05:00
rallytime
49e49ae51b
Mark 2 tests as flaky 
- integration.spm.test_man_spm.SPMManTest.test_man_spm
- integration.ssh.test_state.SSHStateTest.test_state_running
 2018-02-23 09:34:14 -05:00
Jasper Lievisse Adriaanse
a973b70d64
add execution module for OpenBSD Packet Filter 2018-02-22 21:08:35 +01:00
Nicole Thomas
1b01f5d3f8
Merge branch 'develop' into zabbix-inventory 2018-02-21 09:56:05 -05:00
Nicole Thomas
b92346645b
Merge pull request #46107 from amendlik/yumpkg-assumeyes 
Add --assumeyes on YUM/DNF commands
 2018-02-20 17:52:05 -05:00
Adam Mendlik
8d9a432fb2
Add --assumeyes to yum/dnf commands in yumpkg.refresh_db 
Without --assumeyes, these commands can hang waiting for
user confirmation if there is an unaccepted repository key.
 2018-02-19 17:51:11 -07:00
Benjamin Drung
dd3f936557 Fix skipping Kubernetes tests if client is not installed 
When the Kubernetes client is not installed, the import of
salt.modules.kubernetes will still succeed, but HAS_LIBS will be set to
False (since the library import will be covered by a try-except clause).

Therefore expect the salt.modules.kubernetes to always succeed and check
kubernetes.HAS_LIBS instead for the presence of the kubernetes library.

Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>
 2018-02-19 12:32:14 +01:00
rallytime
2d0f81fd1b
Merge branch 'oxygen.rc1' into 'oxygen' 
No conflicts.
 2018-02-16 12:36:13 -05:00
Nicole Thomas
75fdf72c98
Merge branch 'develop' into 38625_overriding_retcode 2018-02-16 11:39:36 -05:00
Nicole Thomas
94fa990170
Merge pull request #45919 from garethgreenaway/port_45844_to_develop 
[develop] Porting PR #45844 to Develop branch.
 2018-02-16 09:36:43 -05:00
Nicole Thomas
edcb64de76
Merge pull request #45763 from twangboy/win_fix_path_rehash 
Fix rehash function in win_path.py
 2018-02-15 15:05:15 -05:00
Nicole Thomas
be5f4eefab
Lint: Remove extra line 2018-02-15 14:00:59 -05:00
Nicole Thomas
a3c04ad1c6
Merge branch 'develop' into port_45844_to_develop 2018-02-15 11:46:51 -05:00
Tobias Macey
21774a2395
Added the option to explicitly specify the user for django commands 
Being able to specify the user to run django commands as can help to prevent permissions issues from cropping up, such as when compiling static assets or migrating a sqlite database which are then owned by root.
 2018-02-15 09:03:02 -05:00
rallytime
e060a74fd8
Merge branch '2017.7' into 'oxygen' 
Conflicts:
  - salt/cloud/clouds/dimensiondata.py
  - salt/config/__init__.py
  - salt/modules/yumpkg.py
  - salt/pillar/ec2_pillar.py
  - salt/utils/docker/__init__.py
  - salt/utils/vault.py
  - tests/integration/states/test_docker_container.py
  - tests/unit/modules/test_yumpkg.py
  - tests/unit/templates/test_jinja.py
  - tests/unit/utils/test_docker.py
 2018-02-14 16:31:31 -05:00
Nicole Thomas
a1f4092811
Merge pull request #46015 from rallytime/bp-45785 
Back-port #45785 to 2017.7
 2018-02-14 13:16:08 -05:00
Nicole Thomas
1279924f5f
Merge pull request #45991 from terminalmage/fix-duplicate-extra-opts 
yumpkg: Fix a couple issues with _get_extra_opts
 2018-02-14 11:48:28 -05:00
Nicole Thomas
3e18604d75
Merge pull request #45979 from isbm/isbm-parsers-loggerfix-unicode-rc1 
Unicode/logger fix + bugfix: salt/utils/parsers
 2018-02-14 10:39:24 -05:00
Erik Johnson
916766f651
yumpkg: Fix a couple issues with _get_extra_opts 
`_get_extra_opts()` and `_get_branch_option()` were unnecessarily
quoting the value, causing it to be interpreted as a literal quote by
`subprocess.Popen()`.

Also, because there were separate helpers for repo options,
disableexcludes, branch options, and extra options, and specifically
because `_get_extra_opts()` parses *all* kwargs, any of the options from
the other helper funcs would end up being added to the command line
twice if `_get_extra_opts()` was used.

This commit consolidates all of the kwarg inspection and CLI opts
construction to a single helper function. It also adds unit tests to
make sure that we are formatting our commands properly.

Additionally, it makes a minor fix in `refresh_db()` which was not
accounted for when we changed the osmajorrelease grain to an integer in
2017.7.0.
 2018-02-13 22:46:27 -06:00
Nicole Thomas
e7999e260d
Merge pull request #44892 from terminalmage/yamlloader 
Force Salt's YAML loader to load all strings as unicode types
 2018-02-13 17:00:37 -05:00
Erik Johnson
9d004f6512 Use mock 2.0.0 instead of unittest.mock on Python 3 (#2) 
This preserves the custom mock_open we backported from unittest.mock,
but otherwise ditches unittest.mock as it does not have
MagicMock.assert_called in Python releases before 3.6.

This allows us to maintain a uniform mock version across all platforms
and Python releases.
 2018-02-13 20:16:03 +01:00
Ollie Armstrong
ef6ffb1492
Resolve linting errors 2018-02-13 13:27:38 -05:00
Ollie Armstrong
8047066c46
Remove unused import 2018-02-13 13:27:38 -05:00
Ollie Armstrong
8f7c45935a
Add tests for salt.modules.selinux.fcontext_get_policy 2018-02-13 13:27:38 -05:00
Nicole Thomas
b18087cee0
Merge pull request #45711 from bdrung/fix-unicode-tests 
Fix Unicode tests when run with LC_ALL=POSIX
 2018-02-13 12:42:06 -05:00
Nicole Thomas
8ff7d70199
Merge pull request #45785 from oarmstrong/develop 
m/selinux.fcontext_get_policy allow long filespecs
 2018-02-13 12:40:50 -05:00
Nicole Thomas
cf367dbd04
Merge pull request #45942 from terminalmage/issue45679-2017.7 
Fix incorrect translation of docker port_bindings -> ports (2017.7 branch)
 2018-02-13 11:10:02 -05:00
rallytime
d6c2d0693a
Merge branch 'oxygen.rc1' into 'oxygen' 
No conflicts.
 2018-02-13 10:54:25 -05:00
Nicole Thomas
007214f7bf
Merge pull request #45908 from DimensionDataResearch/fix/issue/45884 
Fix for #45884 ("TypeError: can't serialize <NodeImage" when calling salt-cloud with the dimensiondata driver)
 2018-02-12 17:05:28 -05:00
Bo Maryniuk
8b5af58066 Fix lints 2018-02-12 18:54:23 +01:00
Bo Maryniuk
07ef909ea9 Remove unused variables, rename mixin variable to more exact name 2018-02-12 18:54:23 +01:00
Bo Maryniuk
9fa6647bd0 Refactor a unit test for calling PID file removal without the exception 2018-02-12 18:54:23 +01:00
Bo Maryniuk
fe4502b0e4 Add debug logging call to the unit test check 2018-02-12 18:54:23 +01:00
Bo Maryniuk
d9941ce1f3 Throw away unnecessary variable handling 2018-02-12 18:54:23 +01:00
Bo Maryniuk
56818045b6 Add unit test for calling PID deletion as non-root user 2018-02-12 18:54:23 +01:00