Commit Graph

11442 Commits

Author SHA1 Message Date
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
45573a1fdf
Merge pull request #44627 from mstagi/add-vmware-vm-management
Add vmware vm management
2017-12-05 18:07:03 -05:00
Nicole Thomas
59dc7cd96f
Merge pull request #43980 from fishhead108/add-cloud.vmware.convert_to_snapshot-feature
Add convert_to_template feature for cloud.vmware
2017-12-05 14:59:28 -05:00
Nicole Thomas
b946ad3384
Merge pull request #43710 from amendlik/gpg-yaml-sdb
Add GPG support to YAML SDB module
2017-12-05 14:42:41 -05:00
Erik Johnson
ee3486a671
Include failed state/function orchestration results in changes dict
Before this commit they would be in the comment, making it difficult to
programatically analyze the failures.
2017-12-05 00:56:05 -06:00
Adam Mendlik
de5cdde2c1
Fix failing tests for YAML SDB module 2017-12-04 17:42:04 -07:00
Adam Mendlik
5980860f06
Fix lint error in sdb/__init__.py 2017-12-04 17:41:52 -07:00
Adam Mendlik
a3ab2028ad
Make GPG decryption optional for YAML SDB module 2017-12-04 17:41:41 -07:00
Adam Mendlik
5236a2c059
Add tests for YAML SDB module 2017-12-04 17:41:35 -07:00
Nicole Thomas
8e2e1f957e
Merge pull request #44772 from terminalmage/issue36275
Rename environment config option to saltenv, introduce lock_saltenv option
2017-12-04 16:49:23 -05:00
Nicole Thomas
2ad2d4e27d
Merge branch 'develop' into add-vmware-vm-management 2017-12-04 16:41:37 -05:00
Nicole Thomas
da45a7b547
Merge pull request #44555 from mcalmer/develop-teach-pkg-about-provides-try2
Teach pkg state to optionally install capabilities
2017-12-04 15:55:12 -05:00
Nicole Thomas
714d057295
Merge branch 'develop' into move-44053 2017-12-04 12:53:59 -05:00
Michael Calmer
bbf542d5d1 pylint fixes 2017-12-04 15:38:23 +01:00
Michael Calmer
b6365aee3c fix order of parameters in unit tests 2017-12-04 15:38:22 +01:00
Michael Calmer
3d04f7d1fe test package capability feature 2017-12-04 15:38:22 +01:00
twangboy
371e210247
Add ability to reset file system object perms 2017-12-01 16:51:18 -07:00
Thomas S Hatch
887336c6de
Merge pull request #44691 from isbm/isbm-ansiblegate-issue44670
Bugfix: ansiblegate, issue 44670
2017-12-01 16:11:52 -07:00
Nicole Thomas
5b3da7dbb3
Merge pull request #44762 from cloudflare/sync-thorium
Add saltutil.sync_thorium execution and runner functions
2017-12-01 09:21:19 -05:00
Agnes Tevesz
42fcaf6c05 Fixed esxvm module, schema, proxy, states and vmware utils, vsphere
module pr-pylint issues
2017-12-01 11:23:38 +01:00
Agnes Tevesz
a517550bc3 Added to tests.modules.test_vsphere the esxvm compatibility for tests 2017-12-01 11:23:27 +01:00
Agnes Tevesz
c1b430ca65 Added tests: unit.utils.vmware.test_vm, covers:
- vm creation
 - vm registation
2017-12-01 11:22:57 +01:00
Agnes Tevesz
c3c15a2b92 Adding vmware utils changes for virtual machine management, tests are
included
2017-12-01 11:22:43 +01:00
Bo Maryniuk
e1eec2c69d Add unit test for __virtual__ in case Ansible is installed on the Minion 2017-12-01 11:21:27 +01:00
Bo Maryniuk
fa21af69dd Add unit test for __virtual__ in case Ansible is not installed on the Minion 2017-12-01 11:21:27 +01:00
Nicole Thomas
5c737100c4
Merge pull request #44726 from terminalmage/issue42188
Add __context__ to RunnerClient and WheelClient
2017-11-30 19:03:02 -05:00
Erik Johnson
c1e4bea83e
Change lock message 2017-11-30 14:30:44 -06:00
Erik Johnson
3770cd7dd3
Add unit test for lock_saltenv
Also move up the _get_opts in state.pkg to make it easier to unit test
2017-11-30 14:28:09 -06:00
Erik Johnson
683e2cc502
Rename 'environment' config option to 'saltenv'
'environment' predates the 'saltenv' nomenclature, and since we have
been using saltenv on the CLI for years, and now also have pillarenv, it
makes sense to make this change.
2017-11-30 13:08:49 -06:00
rallytime
dc3097cedd
Write a unittest for error message raised with missing "." in function 2017-11-30 11:05:22 -05:00
Mircea Ulinic
dce017b3f7
Make tests happy 2017-11-30 15:50:11 +00:00
Erik Johnson
74a18f387f
Update orchestration unit tests 2017-11-29 15:51:53 -06:00
Nicole Thomas
1855f3fe12
Merge pull request #43783 from garethgreenaway/43647_fix_InitiatorName_in_comments
[develop] Fix to grains/core.py
2017-11-29 09:05:59 -05:00
Erik Johnson
18905cf32b
Add integration test for triggering orchestration failure via context 2017-11-28 22:03:11 -06:00
Gareth J. Greenaway
89b546c075
Merge branch 'develop' into netbox-module 2017-11-28 15:25:42 -08:00
Gareth J. Greenaway
6ee18e4f38
Merge branch 'develop' into 43647_fix_InitiatorName_in_comments 2017-11-28 13:35:11 -08:00
Nicole Thomas
669f037761
Merge pull request #44703 from terminalmage/fix-ssh-test
Fix ssh state.show_top integration test (develop branch)
2017-11-28 12:41:34 -05:00
Nicole Thomas
a5828d6ad9
Merge branch 'develop' into 43647_fix_InitiatorName_in_comments 2017-11-28 09:17:34 -05:00
Erik Johnson
682fc1b884
Fix failing grains test on CentOS
Resolves https://github.com/saltstack/salt-jenkins/issues/556
2017-11-27 21:37:46 -06:00
Zach Moody
1faa685d9e fixup pylint import error. 2017-11-27 19:05:51 -06:00
Zach Moody
871a90cbc5 add netbox execution module 2017-11-27 18:59:06 -06:00
Erik Johnson
1f893d1e95
Fix ssh state.show_top integration test
63823f3 changed how we handle cases where master_tops and top file
matches both exist in a given environment. This updates the test to
reflect the correct behavior in develop based on the fact that the
master_tops_first config option is set to False.

See: https://github.com/saltstack/salt/pull/44697#issuecomment-347373412
and the subsequent comments in that pull request.
2017-11-27 18:50:10 -06:00
Nicole Thomas
7adc0b5b6f
Merge pull request #43893 from olivier-mauras/saltclass
SaltClass: Correct when dict is NoneType because of the value doesn't exist
2017-11-27 16:24:25 -05:00
Nicole Thomas
94001ffc64
lint: whitespace fixes 2017-11-27 16:15:44 -05:00
Nicole Thomas
e8298d734d
Merge branch 'develop' into 43647_fix_InitiatorName_in_comments 2017-11-27 15:08:36 -05:00
Nicole Thomas
cae5309752
Merge pull request #44646 from mchugh19/pip-is_installed
add is_installed function
2017-11-27 14:40:55 -05:00
Erik Johnson
8ee5e57fee
Merge pull request #44649 from rallytime/merge-develop
[develop] Merge forward from 2017.7 to develop
2017-11-27 11:23:29 -06:00
Nicole Thomas
9e45e4eff9
Lint: Remove extra blank lines 2017-11-27 11:25:05 -05:00
Jorge Schrauwen
a94edecc93
Merge branch 'develop' into zpoolupdate 2017-11-23 16:53:41 +01:00