Mike Place
2986e301cc
Merge pull request #43794 from rallytime/panos-module-fixes
...
Fixup a couple of issues with the panos execution module
2017-09-29 11:45:37 +02:00
garethgreenaway
fc7a69313b
Merge branch 'develop' into panos-module-fixes
2017-09-28 19:49:40 -07:00
garethgreenaway
61280cc0c3
Merge branch 'develop' into release-note-formatting
2017-09-28 19:49:12 -07:00
申艳芬
8f58f7b8ab
bugfix: Catch OSError/IOError when check minion cache
...
Signed-off-by: 申艳芬 <SYF@shenyanfens-MacBook-Pro.local>
2017-09-29 08:38:08 +08:00
Vernon Cole
e9661aea07
lint: must not use bare except: even in teardown
2017-09-28 18:27:54 -06:00
vernoncole
8d27e20b63
replace salt.utils.sdb calls with __utils__
2017-09-28 16:43:47 -06:00
Simon Dodsley
676c18481f
Fix trailing newline on grains
...
The grains iscsi_iqn and fc_wwn have training newlines which cause
show when calling the grain from a state file and trying to pass
this to an execution module.
Remove the training newline with rstrip()
2017-09-28 14:50:08 -07:00
Nicole Thomas
63821381a0
Merge pull request #39670 from smarsching/feature-parallel-runners
...
Added the saltmod.parallel_runners state.
2017-09-28 17:30:08 -04:00
vernoncole
0c884b183f
correct handling of machine name lookup
2017-09-28 14:29:28 -06:00
Erik Johnson
66e6e89dc7
Properly handle UNC paths in salt.utils.path.readlink()
...
When unpacking the destination of a symbolic link in Windows, links
which point to UNC paths start with "UNC\" instead of "\\". This causes
win32file.GetLongFileName to raise an exception. This commit modifies
salt.utils.path.readlink() to return the path in the proper UNC format,
and it also updates the roots backend to simply use the link path rather
than the destination when following symlinks which point to a UNC path.
2017-09-28 14:39:37 -05:00
Nicole Thomas
15b46846fc
Merge pull request #41233 from dnABic/fix/rabbitmq_policy
...
added parameter apply_to for rabbitmq policy
2017-09-28 15:03:42 -04:00
Nicole Thomas
a7775c7ca3
Merge pull request #43795 from sdodsley/releasenotes
...
Update Oxygen Release notes with new grains and module
2017-09-28 13:37:08 -04:00
Nicole Thomas
7304907db6
Merge pull request #43800 from Ch3LL/update_7.0
...
Add note to nitrogen release notes about pip for cent6
2017-09-28 13:36:48 -04:00
Nicole Thomas
3f77571dad
Merge branch 'develop' into high-out-by_id
2017-09-28 13:27:47 -04:00
Nicole Thomas
9528169d42
Merge branch 'develop' into feature-parallel-runners
2017-09-28 13:13:49 -04:00
Nicole Thomas
28b9d9af26
Merge branch 'develop' into fix/rabbitmq_policy
2017-09-28 12:01:13 -04:00
Ch3LL
50779c3b1c
Add note to nitrogen release notes about pip for cent6
2017-09-28 11:50:54 -04:00
Alexandru Bleotu
503cb9c93a
pylint
2017-09-28 11:32:03 -04:00
Alexandru Bleotu
8c5b021519
Added * as an include all wildcard in extra_minion_data_in_pillar external pillar (+ test)
2017-09-28 11:32:01 -04:00
Mike Place
77ef439ee0
Merge pull request #41956 from yagnik/encrypted-salt
...
Add support for encrypted tag in yaml serializer
2017-09-28 16:41:01 +02:00
Mike Place
6f687fdcff
Merge pull request #43779 from twangboy/win_fix_test_state
...
Fix `unit.modules.test_state` for Windows
2017-09-28 16:27:02 +02:00
Simon Dodsley
cdafbe2068
Update Oxygen Release notes with new grains and module
...
Also do a final cosmetic fix to the purefa module documentation
2017-09-28 07:26:30 -07:00
Mike Place
db0f569f7a
Merge pull request #43782 from twangboy/win_fix_test_virt
...
Fix `unit.modules.test_virt` for Windows
2017-09-28 16:25:15 +02:00
Mike Place
5bbbd10657
Merge pull request #43789 from 3add3287/pillar_file_tree_nodegroup_merging_fixed
...
Properly merge pillar data when using multiple nodegroups
2017-09-28 16:21:32 +02:00
rallytime
25a440a2ea
Fixup a couple of issues with the panos execution module
...
- Spelling errors
- Version added tag for Oxygen
- Use correct import for salt.exceptions
2017-09-28 10:12:06 -04:00
rallytime
d862a6f3f2
Fix some formatting issues on the oxygen release notes page
2017-09-28 09:52:04 -04:00
Mike Place
8ddf2e9442
Merge pull request #43751 from alexbleotu/esxi_vsan_states-gh
...
ESXi diskgroup and host cache creation/configuration + dependencies
2017-09-28 15:21:36 +02:00
Alexandru Bleotu
998c4a95fa
Added tests for salt.pillar.extra_minion_data_in_pillar
2017-09-28 09:14:30 -04:00
Alexandru Bleotu
1a12d5cb30
Added salt.pillar.extra_minion_data_in_pillar that adds any extra minion data into the pillar
2017-09-28 09:14:27 -04:00
Mike Place
6a25bf4475
Merge pull request #42349 from coredumb/saltclass
...
New pillar/master_tops saltclass module
2017-09-28 14:26:45 +02:00
Mike Place
eb89973696
Merge branch 'develop' into feature-parallel-runners
2017-09-28 14:21:13 +02:00
Mike Place
dd4fc52f1e
Merge pull request #43723 from nicholasmhughes/ini_manage-error-handling
...
Fix ini_manage error and change handling
2017-09-28 11:52:08 +02:00
Mike Place
5e29507c21
Merge pull request #43781 from twangboy/win_fix_test_status
...
Fix `unit.modules.test_status` for Windows
2017-09-28 11:06:18 +02:00
Mike Place
05c78ae649
Merge pull request #43785 from twangboy/win_fix_test_znc
...
Fix `unit.modules.test_znc` for Windows
2017-09-28 10:56:10 +02:00
Mike Place
10ddb8491c
Merge pull request #43786 from twangboy/win_fix_test_zypper
...
Fix `unit.modules.test_zypper` for Windows
2017-09-28 10:51:58 +02:00
Mike Place
9615ca32d5
Merge pull request #43773 from rallytime/merge-2017.7
...
[2017.7] Merge forward from 2016.11 to 2017.7
2017-09-28 10:48:38 +02:00
Alexandru Bleotu
90a174c915
more pylint
2017-09-28 04:42:44 -04:00
Alexandru Bleotu
adfa462c05
Fixed tests for salt.utils.vmware.get_hosts
2017-09-28 04:42:42 -04:00
Alexandru Bleotu
2e2b01e57c
Fix logic to list hosts
2017-09-28 04:42:39 -04:00
Alexandru Bleotu
951d43e0a9
pylint
2017-09-28 04:42:37 -04:00
Alexandru Bleotu
ac3a3bdda5
Added VMwareObjectExistsError exception
2017-09-28 04:42:32 -04:00
Alexandru Bleotu
c1d36f53c2
Added host_cache_configured state that configures the host cache on ESXi hosts
2017-09-28 04:42:30 -04:00
Alexandru Bleotu
1423d9dfb9
Added diskgroups_configured state that configures VSAN diskgroups on ESXi hosts
2017-09-28 04:42:27 -04:00
Alexandru Bleotu
152ce0b691
Added salt.states.esxi additional imports and pyVmomi/python compatibility check
2017-09-28 04:42:25 -04:00
Alexandru Bleotu
7d70a014f2
Moved pyVmomi/python incompatibility check from __virtual__ to pyVmomi import as some functions do not use pyVmomi
2017-09-28 04:42:22 -04:00
Alexandru Bleotu
fa6460d578
Added salt.modules.vsphere.remove_datastore
2017-09-28 04:38:16 -04:00
Alexandru Bleotu
29b59a6256
Comment fix in salt.modules.vsphere.rename_datastore
2017-09-28 04:38:13 -04:00
Alexandru Bleotu
8e58f72964
Added salt.modules.vsphere.create_vmfs_datastore
2017-09-28 04:38:11 -04:00
Alexandru Bleotu
23e2fd3aef
Added VmfsDatastoreSchema and HostCacheSchema JSON schemas used in host cache state functions
2017-09-28 04:38:08 -04:00
Alexandru Bleotu
55e5a6ed21
Added DiskGroupsDiskScsiAddressSchema JSON schema
2017-09-28 04:38:06 -04:00
