Nicole Thomas
e7530e268f
Merge pull request #43644 from defanator/boto_rds_parameter_group_fix
...
Several fixes for RDS DB parameter group management
2017-09-26 17:20:20 -04:00
Erik Johnson
8b16300495
Fix some regressions in recent legacy git_pillar deprecation
...
These didn't get caught in PR 42823 because of how we invoke the
git_pillar code. Firstly, the "pillar" argument needed to stay. This is
because even though we're not using it, _external_pillar_data() is still
passing it now that git_pillar is not specially invoked there.
Secondly, since the input comes in as a list, and _external_pillar_data
uses single-asterisk expansion, the repos are passed separately when
they should be passed as a single list. To fix these issues, I've done
the following:
1. Re-introduced the "pillar" argument in git_pillar's ext_pillar
function.
2. Changed the "pillar" variable to avoid confusion with the (unused)
"pillar" argument being passed in.
3. Instead of git_pillar accepting the repos as a list, the ext_pillar
function now uses single-asterisk expansion to make it conform with
how _external_pillar_data() invokes it.
2017-09-26 16:12:55 -05:00
Eric Radman
617c5b72ac
Fix DeprecationWarning for use of 'salt.utils.is_windows'
2017-09-26 15:13:18 -04:00
rallytime
74d315fd28
Merge branch '2017.7' into 'develop'
...
Conflicts:
- salt/modules/file.py
- tests/unit/modules/test_file.py
2017-09-26 13:45:10 -04:00
Nicole Thomas
c51891c939
Merge branch 'develop' into storage_policies-gh
2017-09-26 13:21:56 -04:00
Nicole Thomas
6186da6d41
Merge pull request #43746 from eradman/check_perms
...
Only inspect file attribute if lsattr(1) is installed
2017-09-26 13:20:24 -04:00
Nicole Thomas
e216cc17c2
Merge branch 'develop' into boto_rds_parameter_group_fix
2017-09-26 13:14:12 -04:00
Nicole Thomas
0581e684a3
Merge branch 'develop' into infra5292
2017-09-26 13:00:17 -04:00
Nicole Thomas
2581098595
Merge pull request #43731 from twangboy/win_unit_beacons_test_status
...
Fix `unit.beacons.test_status` for Windows
2017-09-26 12:25:11 -04:00
Nicole Thomas
10f3d47498
Merge pull request #43724 from brejoc/2017.7.kubernetes_delete_test
...
Improved delete_deployment test for kubernetes module
2017-09-26 12:19:30 -04:00
Erik Johnson
74379bac9c
Merge pull request #43720 from rallytime/merge-develop
...
[develop] Merge forward from 2017.7 to develop
2017-09-26 09:53:04 -05:00
Nicole Thomas
d6c2fc0462
Merge pull request #43730 from eradman/openbsd_zfs
...
Skip ZFS module check on OpenBSD
2017-09-26 10:46:12 -04:00
Nicole Thomas
0c02b59ff1
Merge pull request #43349 from michelsen/add-rethinkdb-external-pillar
...
Added RethinkDB external pillar module
2017-09-26 10:35:57 -04:00
Nicole Thomas
13cc27bdab
Merge pull request #43734 from twangboy/win_unit_test_poudriere
...
Fix `unit.modules.test_poudriere` for Windows
2017-09-26 10:13:46 -04:00
Eric Radman
7b9c372677
Only inspect file attribute if lsattr(1) is installed
...
lsattr/chattr is not installed on many Unix-like platforms by default,
including *BSD, Solaris, and minimal Linux distributions such as Alpine.
2017-09-26 10:03:13 -04:00
Nicole Thomas
41aeee7ac8
Merge pull request #43742 from terminalmage/fix-docstring
...
Fix incorrect value in docstring
2017-09-26 09:54:59 -04:00
Nicole Thomas
499e7e8de9
Merge pull request #43705 from hathawsh/develop
...
Fixed the 'status.procs' and 'status.pid' functions for openvzhn environments
2017-09-26 09:43:18 -04:00
Erik Johnson
175b6f14a2
Merge pull request #43706 from twangboy/win_up_to_date
...
Add an `up_to_date` state to the `win_wua` state module
2017-09-26 07:55:55 -05:00
Erik Johnson
553335b1c9
Fix incorrect value in docstring
2017-09-26 07:52:59 -05:00
Erik Johnson
97b4613056
Merge pull request #43647 from sdodsley/inititator_grains
...
Add new grains to display minion storage initiators
2017-09-26 07:42:30 -05:00
Erik Johnson
d78b9a3294
Merge pull request #41998 from twangboy/win_unit_test_environ
...
Fix `unit.modules.test_environ` for Windows
2017-09-26 07:25:48 -05:00
Erik Johnson
7fbbea3806
Merge pull request #42036 from twangboy/win_unit_test_file
...
Fix `unit.modules.test_file` for Windows
2017-09-26 07:23:09 -05:00
Thomas S Hatch
d8f371b8b1
Merge pull request #43669 from moio/develop-limit-minion-processes
...
Introduce process_count_max minion configuration parameter (develop)
2017-09-26 05:56:11 -06:00
Alexandru Bleotu
ac79f89ffa
Fixed utils.pbm unit tests
2017-09-26 04:59:00 -04:00
assafShapira
993dfdb1f2
Merge branch 'develop' into develop
2017-09-26 08:34:17 +03:00
Alexandru Bleotu
4ff745d2c5
Added python/pyvmomi compatibility check to salt.states.pbm + removed reference to Python 2.6
2017-09-25 18:25:12 -04:00
Alexandru Bleotu
e1bfe24891
Removed excs reference from new methods in salt.modules.vsphere
2017-09-25 18:25:09 -04:00
Alexandru Bleotu
f484bd52fd
more pylint
2017-09-25 18:25:07 -04:00
Alexandru Bleotu
b6577e4328
pylint
2017-09-25 18:25:04 -04:00
Alexandru Bleotu
36fc89c9a2
Added salt.states.pbm.default_storage_policy_assigned state that manages default storage policies to datastore assigments
2017-09-25 18:25:02 -04:00
Alexandru Bleotu
bb52e0d331
Added salt.states.pbm.storage_policies_configured state that creates/configures storage policies
2017-09-25 18:24:59 -04:00
Alexandru Bleotu
9f96c1fcc0
Added salt.states.pbm.default_vsan_policy_configured state that configures the default storage policy
2017-09-25 18:24:56 -04:00
Alexandru Bleotu
da39e7ce84
Comments, imports, init function in salt.states.pbm
2017-09-25 18:24:54 -04:00
Alexandru Bleotu
58445e927b
Updated all vsphere tests to support the vcenter proxy
2017-09-25 18:24:51 -04:00
Alexandru Bleotu
94929d5415
Added support for vcenter proxy in salt.modules.vsphere
2017-09-25 18:24:49 -04:00
Alexandru Bleotu
483fa0d838
Added salt.modules.vcenter shim execution module between the proxy and other execution modules
2017-09-25 18:24:46 -04:00
Alexandru Bleotu
176222b0cf
Added vcenter proxy
2017-09-25 18:24:44 -04:00
Alexandru Bleotu
507910b956
Added VCenterProxySchema JSON schema that validates the vcenter proxy
2017-09-25 18:24:41 -04:00
Alexandru Bleotu
0b2b79692a
Added salt.modules.vsphere.assign_default_storage_policy_to_datastore
2017-09-25 18:24:39 -04:00
Alexandru Bleotu
582919f551
Added salt.modules.vsphere.list_default_storage_policy_of_datastore that lists the dict representation of the policy assigned by default to a datastore
2017-09-25 18:24:37 -04:00
Alexandru Bleotu
41a65bf414
Added salt.modules.vsphere.update_storage_policy
2017-09-25 18:24:34 -04:00
Alexandru Bleotu
a5ae51f616
Added salt.modules.vsphere.create_storage_policy
2017-09-25 18:24:32 -04:00
Alexandru Bleotu
ee2af6fc9c
Added salt.modules.vsphere._apply_policy_config that applies a storage dict representations values to a object
2017-09-25 18:24:29 -04:00
Alexandru Bleotu
c88c207011
Added salt.modules.vsphere.list_capability_definitions that returns dict representations of VMware capability definition
2017-09-25 18:24:27 -04:00
Alexandru Bleotu
8275e57106
Added salt.modules.vsphere._get_capability_definition_dict that transforms a VMware capability definition into a dict representation
2017-09-25 18:24:24 -04:00
Alexandru Bleotu
f9f84fde9a
Added salt.modules.vsphere.list_default_vsan_policy that retrieves dict representation of the default storage policies
2017-09-25 18:24:22 -04:00
Alexandru Bleotu
6bb0111b32
Added salt.modules.vsphere.list_storage_policies that retrieves dict representations of storage policies, filtered by name
2017-09-25 18:23:00 -04:00
Alexandru Bleotu
6da3ff5d93
Added salt.modules.vsphere._get_policy_dict that transforms a policy VMware object into a dict representation
2017-09-25 18:21:35 -04:00
Alexandru Bleotu
a3047ad307
Added tests for salt.utils.pbm.assign_default_storage_policy_to_datastore
2017-09-25 18:19:17 -04:00
Alexandru Bleotu
20fca4be44
Added salt.utils.pbm.assign_default_storage_policy_to_datastore
2017-09-25 18:19:15 -04:00
