Commit Graph

85959 Commits

Author SHA1 Message Date
Alexandru Bleotu
e811eb9c85 Added tests for utils.vsan.get_vsan_cluster_config_system 2017-09-14 12:47:44 -04:00
Alexandru Bleotu
fface2f385 Added utils.vsan.get_vsan_cluster_config_system that retrieves the VSAN cluster configuration system 2017-09-14 12:47:43 -04:00
Alexandru Bleotu
a2f84e6f39 Added tests for utils.vsan.vsan_supported 2017-09-14 12:47:41 -04:00
Alexandru Bleotu
3912e4e338 Added utils.vsan.vsan_supported that returns whether the VSAN API is supported 2017-09-14 12:47:39 -04:00
Alexandru Bleotu
88e445a0d0 Created utils.vsan and added dependencies and __virtual__ function 2017-09-14 12:47:38 -04:00
Alexandru Bleotu
324883993f Added external VMware VSAN libraries 2017-09-14 12:47:36 -04:00
Alexandru Bleotu
c3d6af502b Added tests for modules.vsphere.list_cluster 2017-09-14 12:47:34 -04:00
Alexandru Bleotu
728690b783 Added modules.vsphere.list_cluster that lists a dict representation of a VMware cluster 2017-09-14 12:08:52 -04:00
rallytime
75abf0a2a9 Test fix: update mock util path 2017-09-14 11:01:06 -04:00
Alexandru Bleotu
e6ab4d5690 Added modules.vsphere._get_cluster_dict that converts a cluster VMware object to a dictionary 2017-09-14 10:52:29 -04:00
Alexandru Bleotu
15a2499d27 Added tests for salt.vsphere._get_proxy_target 2017-09-14 10:52:28 -04:00
Alexandru Bleotu
e24513f0f3 Added salt.vsphere._get_proxy_target that retrieved the vCenter target from the proxy details 2017-09-14 10:52:28 -04:00
Nicole Thomas
ebbc3c11d0 Merge pull request #43483 from 3add3287/modules-ssh-add-newline-fix
Handle bogus newline before newly added keys
2017-09-14 10:19:51 -04:00
rallytime
dcd3dcc734 Lint: Add missing import to utils.args.py 2017-09-14 10:15:20 -04:00
Nicole Thomas
aee52a20e0 Lint: Add empty line at end of file 2017-09-14 09:48:09 -04:00
Ronald van Zantvoort
efb23cd717 highstate output pylint fix 2017-09-14 15:32:32 +02:00
Nicole Thomas
32a5221f70 Merge pull request #43498 from vernondcole/fix_preflight
preflight_cmds should use passed opts
2017-09-14 09:20:56 -04:00
Robin Lutz
e1428dec5f corrected some PEP8 problems reported by jenkins 2017-09-14 14:24:54 +02:00
Ronald van Zantvoort
888c853fc4 highstate output minor cleanup and code duplication removal 2017-09-14 13:40:39 +02:00
garethgreenaway
e04018ff3c Merge branch 'develop' into move-new-utils-funcs 2017-09-13 19:26:08 -07:00
vernoncole
05fe5bed7c preflight_cmds should use passed opts 2017-09-13 20:10:49 -06:00
Gareth J. Greenaway
17b1e7c28d Merge branch '41510_mount_opts' of github.com:garethgreenaway/salt into 41510_mount_opts 2017-09-13 18:49:46 -07:00
Gareth J. Greenaway
1b5b91b077 Ensure write_cache function in utils/mount.py returns something useful. 2017-09-13 18:49:22 -07:00
Nicole Thomas
7addeb4b9c Lint: fix spacing 2017-09-13 18:35:49 -04:00
Nicole Thomas
36bc4ac912 Merge pull request #43462 from rdutch/beacon_state_fix
Added save argument to Beacon state module
2017-09-13 18:33:32 -04:00
rallytime
acb98bbce2 Move salt.utils.argspec_report to salt.utils.args.py 2017-09-13 18:12:52 -04:00
rallytime
9df868930a Move salt.utils.arg_lookup to salt.utils.args.py 2017-09-13 17:37:49 -04:00
rallytime
82feaea913 Move salt.utils.xor to salt.utils.value 2017-09-13 16:49:16 -04:00
rallytime
6e7149cd71 Move salt.utils.human_to_bytes to salt.utils.stringutils 2017-09-13 16:30:52 -04:00
Nicole Thomas
f8ef7dce40 Merge pull request #43469 from alexbleotu/test_fixes-gh
Fixed several tests
2017-09-13 15:53:53 -04:00
Nicole Thomas
395f079daf Merge branch 'develop' into modules-ssh-add-newline-fix 2017-09-13 15:51:48 -04:00
rallytime
bfcfcd75e8 Merge branch '2017.7' into 'develop'
Conflicts:
  - salt/fileclient.py
  - salt/loader.py
  - salt/minion.py
  - salt/modules/alternatives.py
  - salt/modules/genesis.py
  - tests/unit/modules/test_hosts.py
  - tests/unit/modules/test_ini_manage.py
2017-09-13 15:15:04 -04:00
garethgreenaway
892d459f01 Merge branch 'develop' into 41510_mount_opts 2017-09-13 12:01:42 -07:00
rdutch
fd0b1ca9f9 Merge branch 'develop' into beacon_state_fix 2017-09-13 13:48:20 -05:00
Hilberding, Rob
810899d413 Simplified if statement 2017-09-13 13:44:05 -05:00
3add3287
999deacb0a Fix indentation from tabs to spaces 2017-09-13 20:38:39 +02:00
Nicole Thomas
c3d9e2d9b2 Merge pull request #43431 from mattLLVW/fix-hosts-deb
Fix /etc/hosts not being modified when hostname is changed
2017-09-13 14:35:54 -04:00
Nicole Thomas
75e8c181ec Merge pull request #43485 from rallytime/linode-utils
Move "salt.utils" calls to __utils__ in linode driver
2017-09-13 14:31:21 -04:00
Hilberding, Rob
b71e7e673f Made the requested changes 2017-09-13 13:19:12 -05:00
Nicole Thomas
d2b13ce4c0 Merge pull request #43468 from terminalmage/git-configparser
Fix unicode handling on PR #43378
2017-09-13 13:57:17 -04:00
Gareth J. Greenaway
2459bafeb5 fixing merge conflicts 2017-09-13 10:43:02 -07:00
Gareth J. Greenaway
b2475b1c35 Adding a check in case the cache file is empty. 2017-09-13 10:30:16 -07:00
Gareth J. Greenaway
594c324beb Updating unmounted state to ensure the cache is updated and mount is cleared out on unmount. 2017-09-13 10:30:16 -07:00
Gareth J. Greenaway
df571b90aa adding utils/mount.py 2017-09-13 10:30:16 -07:00
Gareth J. Greenaway
132b56d785 Updating mount to allow opts in the state file to be removed and have the volume remounted 2017-09-13 10:30:15 -07:00
Alexandru Bleotu
bf3785739e Fixed failing config.test_api tests for when the ROOT_DIR is / 2017-09-13 13:01:15 -04:00
Mike Place
4fc64fd5b9 Merge pull request #43465 from psagers/develop
acme.cert: avoid IOError on failure.
2017-09-13 10:52:15 -06:00
Mike Place
cebe28e217 Merge pull request #43466 from cachedout/cisc_oxygen_release_notes
Add information about cimc to release notes
2017-09-13 10:46:41 -06:00
Mike Place
9767e46ce4 Merge branch 'develop' into cisc_oxygen_release_notes 2017-09-13 10:45:24 -06:00
Mike Place
d2b790d883 Merge pull request #43471 from alexbleotu/esxcluster-gh
Esxcluster proxy minion and support in vsphere module
2017-09-13 10:11:22 -06:00