Commit Graph

60488 Commits

Author SHA1 Message Date
Mike Place
91806b03b9 Merge pull request #30905 from joejulian/2015.8_fix_lvm_pv_mapper
Add realpath to lvm.pvdisplay and use it in vg_present
2016-02-05 10:05:32 -07:00
Mike Place
af2832b69d Merge pull request #30924 from youngnick/glusterfs-start-volume-bug
Fix small bug with starting volumes after creation.
2016-02-05 09:58:22 -07:00
Mike Place
3a6666ad25 Merge pull request #30910 from cro/fx2_idrac
fix iDRAC state
2016-02-05 09:49:06 -07:00
Mike Place
101fa12479 Merge pull request #30919 from garethgreenaway/ssh_auth_cp_get_url_needs_saltenv
Fixes to ssh_auth state module
2016-02-05 09:15:28 -07:00
C. R. Oldham
68af2ab185 Lint. 2016-02-05 08:09:32 -07:00
Nick Young
be5295cf7b Fix small bug with starting volumes after creation.
Looks like when the module got changed to use the _gluster_xml function, this command was missed; using create now with start: True will raise an exception. Removing the initial 'gluster' will fix it.

Fixes #30923.
2016-02-05 16:06:41 +11:00
C. R. Oldham
c274c7ef6c Lint. 2016-02-04 19:51:30 -07:00
Joe Julian
f96650f3c3 Add realpath to lvm.pvdisplay and use it in vg_present
Any sort of symlink could be used for inclusion into an lvm vg but lvm's
pvdisplay may show a real device name, or a mapper device name which is
a symlink.

Since we're interested in finding out if the actual device is part of
our volgroup, we test the realpath of both the device requested and the
device returned by pvdisplay to ensure they're the same device.

Fixes #26867 and #30882
2016-02-04 17:21:38 -08:00
jacobhammons
6d4fd11dd0 Merge pull request #30920 from jacobhammons/release-notes
Versioned to 2015.8.5, added known issue #30300 to release notes
2016-02-04 18:12:17 -07:00
Jacob Hammons
93d47f8615 Versioned to 2015.8.5, added known issue #30300 to release notes 2016-02-04 18:10:59 -07:00
Gareth J. Greenaway
c9ba038553 The call to cp.get_url needs the saltenv, if you're using environments other than base, it will fail. 2016-02-04 16:55:35 -08:00
Mike Place
3d3321ab92 Merge pull request #30894 from terminalmage/issue30858
git module/state: Handle identity files more gracefully
2016-02-04 16:55:01 -07:00
C. R. Oldham
3e38b762bf Add generic command for executing racadm commands on
individual blades in a chassis.
2016-02-04 15:44:43 -07:00
C. R. Oldham
05979010f5 Finish the idrac state, fix problem with grains not loading sometimes. 2016-02-04 15:06:26 -07:00
Mike Place
2415b3e62e Merge pull request #30750 from jfindlay/war_version
extract whole war version
2016-02-04 14:41:01 -07:00
Mike Place
6a6456eaa6 Merge pull request #30884 from rallytime/fix-30817
Move checks for private_key file existence and permissions to create function
2016-02-04 14:03:23 -07:00
Mike Place
4ae2d829f0 Merge pull request #30888 from ticosax/backport-30797
Backport #30797 to 2015.8
2016-02-04 14:02:25 -07:00
Mike Place
4372851ad9 Merge pull request #30895 from bdrung/2015.8
Fix various typos
2016-02-04 13:55:10 -07:00
Mike Place
cdca33021a Merge pull request #30889 from alprs/fix-cache_msgpack_optional
Make msgpack an optional dependency in salt.utils.cache
2016-02-04 13:53:39 -07:00
Mike Place
0dff45b4ac Merge pull request #30896 from vutny/nodegroups-in-master-config-example
Update nodegroups parameter examples in master config example and docs
2016-02-04 13:52:35 -07:00
Mike Place
33a400e943 Merge pull request #30898 from abednarik/fix_pkg_version_debian_family
Fix pkg install with version.
2016-02-04 13:52:14 -07:00
Erik Johnson
08741eb969 Update versionadded/versionchanged
These changes did not make it in before v2015.8.6 was tagged.
2016-02-04 12:54:50 -06:00
Colton Myers
89bac9076a Merge pull request #30867 from rallytime/boto-utils-fix
Pass in 'pack' variable to utils.boto.assign_funcs function from ALL boto modules
2016-02-04 11:37:05 -07:00
Erik Johnson
8909d430e1 salt.states.git.latest(): Prevent tracebacks when git ssh auth fails
This adds missing try/except blocks to ensure that a failed git ssh auth
doesn't cause a traceback.

It also adds information to the documentation for the "identity" param
which explains that passphraseless keys cannot be used unless Salt is
invoked using salt-call.
2016-02-04 12:03:28 -06:00
Erik Johnson
c961cf1c7d git: only use passphrase-protected key if invoked using salt-call 2016-02-04 12:03:28 -06:00
Erik Johnson
0b286f1bc3 Add global ssh_config path to git ssh wrapper
This ensures that a matching entry in a local ssh_config (~/.ssh/config)
doesn't override the "-i" parameter.
2016-02-04 12:03:28 -06:00
Erik Johnson
f813cce4ad Add salt.modules.ssh.key_is_encrypted() 2016-02-04 12:03:28 -06:00
Erik Johnson
1ae7c53e17 Add salt.utils.files.process_read_exception()
This is a common function to raise exceptions encountered trying to read
from a file.
2016-02-04 12:03:28 -06:00
rallytime
6ad7642f6d Lint 2016-02-04 11:00:02 -07:00
rallytime
58778dfc88 Fix failing boto_vpc module unit tests 2016-02-04 10:33:41 -07:00
abednarik
b15cdfd799 Fix pkg install with version.
In new_pkgs dict keys are with the format package=version this makes this function
call to not return package version in Ubuntu systems.
Would be a good check to see if this also fails in other Linux distributions.

Fixes #30792.
2016-02-04 10:20:14 -03:00
Denys Havrysh
936c1ff6c8 Add explanation about N@ classifier. Inspired by #25292 2016-02-04 14:06:41 +02:00
Benjamin Drung
708f2ff8ea Fix typo reponse -> response 2016-02-04 13:06:04 +01:00
Benjamin Drung
72c4eab6d7 Fix typo propogate -> propagate 2016-02-04 13:04:27 +01:00
Benjamin Drung
4912e365cb Fix typo directores -> directories 2016-02-04 13:03:12 +01:00
Benjamin Drung
74c8aba03e Fix typo exeption -> exception 2016-02-04 13:01:41 +01:00
Benjamin Drung
4692d84b07 Fix typos of improvement 2016-02-04 13:00:25 +01:00
Benjamin Drung
213fc2d858 Fix typo occuring -> occurring 2016-02-04 12:59:07 +01:00
Denys Havrysh
8bc2426816 Update example in master config documentation reference 2016-02-04 13:58:41 +02:00
Benjamin Drung
fe6124003b Fix typo nonexistant -> nonexistent 2016-02-04 12:58:20 +01:00
Benjamin Drung
56ce7479b1 Fix typo catched -> caught 2016-02-04 12:57:20 +01:00
Benjamin Drung
821e690e65 Fix typo develoment -> development 2016-02-04 12:56:14 +01:00
Benjamin Drung
b51279e086 Fix typo overide -> override 2016-02-04 12:55:35 +01:00
Benjamin Drung
4f2f04ea7d Fix typo relevent -> relevant 2016-02-04 12:54:45 +01:00
Benjamin Drung
fe8be562c5 Fix typo existance -> existence 2016-02-04 12:54:04 +01:00
Benjamin Drung
4a2f4de1a8 Fix typo accross -> across 2016-02-04 12:53:20 +01:00
Denys Havrysh
ca8c0bdc3f Update nodegroups section example in master config according to docs 2016-02-04 13:52:56 +02:00
Benjamin Drung
9ae50c993e Fix typo Lenth -> Length 2016-02-04 12:52:23 +01:00
Benjamin Drung
20e79981e1 Fix typo preferrably -> preferably 2016-02-04 12:51:38 +01:00
Benjamin Drung
f8d9f608dd Fix typo addres -> address 2016-02-04 12:49:59 +01:00