Commit Graph

86602 Commits

Author SHA1 Message Date
Alexandru Bleotu
8b7af00e27 Added salt.utils.vmware.get_disks 2017-09-28 04:34:35 -04:00
Alexandru Bleotu
5a8cc2f19f Added salt.utils.vmware.get_scsi_address_to_lun_map 2017-09-28 04:34:32 -04:00
Alexandru Bleotu
cc21f382d5 Added salt.utils.vmware.get_all_luns 2017-09-28 04:34:30 -04:00
Alexandru Bleotu
27cd7cf8e7 Added salt.utils.vmware._get_scsi_address_to_lun_key_map 2017-09-28 04:34:27 -04:00
Alexandru Bleotu
783a75a57c Improved logic to filter hosts based on parent in salt.utils.vmware.get_hosts 2017-09-28 04:34:25 -04:00
Alexandru Bleotu
a34cf1215b Added salt.utils.vmware.remove_datastore 2017-09-28 04:34:22 -04:00
Alexandru Bleotu
9831a5df77 Added salt.utils.vmware.get_host_datastore_system 2017-09-28 04:34:20 -04:00
Alexandru Bleotu
8e1eb19e4b Added salt.utils.vmware.create_vmfs_datastore 2017-09-28 04:34:17 -04:00
Alexandru Bleotu
cd4d2963d4 Added salt.utils.vmware._get_new_computed_partition_spec 2017-09-28 04:34:15 -04:00
Alexandru Bleotu
4d6eb4197a Added salt.utils.vmware._get_partition_info 2017-09-28 04:34:13 -04:00
Alexandru Bleotu
273afc1015 Added salt.exceptions.VMwareObjectNotFoundError 2017-09-28 04:34:10 -04:00
Alexandru Bleotu
a8406fb3b2 Added salt.utils.vsan.remove_diskgroup 2017-09-28 04:34:08 -04:00
Alexandru Bleotu
d8a2724c42 Added salt.utils.vsan.remove_capacity_from_diskgroup 2017-09-28 04:34:05 -04:00
Alexandru Bleotu
d637b074b9 Added salt.utils.vsan.add_capacity_to_diskgroup 2017-09-28 04:34:03 -04:00
Alexandru Bleotu
6a31c437df Added salt.utils.vsan.create_diskgroup 2017-09-28 04:34:00 -04:00
Alexandru Bleotu
67afc2f841 Added salt.utils.vsan.get_host_vsan_system 2017-09-28 04:33:58 -04:00
Alexandru Bleotu
230c17e704 Added salt.utils.vsan.get_vsan_disk_management_system 2017-09-28 04:33:55 -04:00
Alexandru Bleotu
ffbab2ce89 Added esxi proxy support and retrieval of esxi reference in salt.modules.vsphere._get_proxy_target 2017-09-28 04:33:53 -04:00
Alexandru Bleotu
5c79512904 Added salt.modules.vsphere._get_esxi_proxy_details 2017-09-28 04:30:40 -04:00
Alexandru Bleotu
434d88b9a4 Added salt.modules.esxi.get_details that returns the proxy details 2017-09-28 04:30:37 -04:00
Alexandru Bleotu
3369a3def7 Added the EsxiProxySchema JSON schema 2017-09-28 04:30:35 -04:00
Alexandru Bleotu
6bd5c23645 Added sspi mechanism support and __pillar__ and config merging to salt.proxy.esxi 2017-09-28 04:30:32 -04:00
3add3287
19acf9b149 Properly merge pillar data obtained from multiple nodegroups for cases
where the minion belongs to more than one

Fixes #43788
2017-09-28 09:12:24 +02:00
Nicole Thomas
e4be436ca1 Merge pull request #43674 from alexbleotu/storage_policies-gh
VMware vCenter proxy + storage policies states & dependencies
2017-09-27 14:56:39 -04:00
Nicole Thomas
05d10e7eff Merge pull request #43656 from keesbos/git-pillar-fixes
Git pillar fixes
2017-09-27 14:50:31 -04:00
garethgreenaway
0d72edfcb7 Merge pull request #43765 from BenjaminSchiborr/fix_broken_salt_return
Fix return code of puppet module
2017-09-27 11:47:55 -07:00
Alexandru Bleotu
5c3109ff07 Removed commented imports 2017-09-27 12:55:46 -04:00
garethgreenaway
0a2a2edf20 Merge branch 'develop' into fix_broken_salt_return 2017-09-27 08:31:05 -07:00
Kees Bos
1de6791069 Fix git-pillar ext_pillar for __env__ usage
The env must be mapped from '__env__' before validation of the
env is done. Otherwise it will (naturally) fail, since __env__
in itself will never be a valid branch name.
2017-09-27 17:28:49 +02:00
Nicole Thomas
50eff5e895 Merge pull request #43771 from sdodsley/purefa_docfix
Fix documentation portion of module: indent issue corrected to ensure code block ends correctly [purefa]
2017-09-27 11:11:02 -04:00
Nicole Thomas
4ed8a3ce1f Merge pull request #43760 from terminalmage/fix-legacy_git_pillar-deprecation
Fix some regressions in recent legacy git_pillar deprecation
2017-09-27 10:55:18 -04:00
Nicole Thomas
760e391f03 Merge pull request #43567 from assafShapira/develop
Fix xen server cloud driver
2017-09-27 10:49:41 -04:00
Nicole Thomas
fbfabbe1e9 Merge pull request #43640 from bodhi-space/infra5292
INFRA-5292 - small fix for boto_iam AWS rate limiting errors
2017-09-27 10:48:45 -04:00
Nicole Thomas
92c10689e4 Merge pull request #43757 from eradman/is_windows
Fix DeprecationWarning for use of 'salt.utils.is_windows'
2017-09-27 10:47:20 -04:00
Nicole Thomas
a48afa7175 Merge pull request #43763 from twangboy/win_fix_test_disk
Fix `unit.modules.test_disk` for Windows
2017-09-27 10:32:41 -04:00
Simon Dodsley
5e4b122b56 Fix ident issue to ensure code block ends correctly 2017-09-27 06:27:52 -07:00
assaf shapira
000dd8e511 Merge branch 'develop' of https://github.com/assafShapira/salt into develop 2017-09-27 15:28:52 +03:00
assaf shapira
46203c630c ignore_ssl returned to _get_session 2017-09-27 15:28:46 +03:00
Benjamin Schiborr
5c41268dd7 Fix return code of puppet module
Fixes #43762. Successful puppet return codes are 0 and 2. When return code
is 2 salt will fail. puppet.py intercepted that for the json return,
however, the salt job will still fail, because it only parses the return
code of the actual process. This commit changes the actual process to
return 0 for 0 and 2.
2017-09-26 15:32:03 -07:00
twangboy
35505ac966
Honor 80 char limit 2017-09-26 15:52:04 -06:00
twangboy
26b23b37bc
Skip test if missing binaries 2017-09-26 15:51:22 -06:00
Erik Johnson
26a48b9d91 Merge pull request #43753 from rallytime/merge-develop
[develop] Merge forward from 2017.7 to develop
2017-09-26 16:26:57 -05:00
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