Commit Graph

60424 Commits

Author SHA1 Message Date
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
Mike Place
276cf626b0 Merge pull request #30849 from jfindlay/aws_seconds
utils.aws: use time lib to conver to epoch seconds
2016-02-03 15:47:31 -07:00
Mike Place
4cbc8a8250 Merge pull request #30874 from terminalmage/issue30869
Fix regression in git_pillar when multiple remotes are configured
2016-02-03 15:24:02 -07:00
Erik Johnson
9cf0c8126d Fix regression in git_pillar when multiple remotes are configured
05782aa introduced a regression in which only one repo's pillar data
would be evaluated if more than one repo was configured under the same
"git" entry in ext_pillar.

The reason for this is that the ``pillar_roots`` list that we build
always has the same order, and that order of precedence means that when
the Pillar class goes to grab the top file, it always gets the first one
in the list. So when processing the pillar data for the 2nd source, it
grabs the first source's top.sls file instead, and when it doesn't find
SLS matches no pillar data is compiled for that 2nd source.

This fixes the problem by ensuring that the pillar_dir currently being
processed is always first in the ``pillar_roots`` list, so that the
correct top file is grabbed.

Fixes #30869.
2016-02-03 13:56:16 -06:00
Mike Place
8410842aea Merge pull request #30850 from jfindlay/dpkg_var
modules.dpkg._get_pkg_info: allow for ubuntu 12.04
2016-02-03 09:33:26 -07:00
Mike Place
9a3ec9d028 Merge pull request #30852 from replicant0wnz/error-message-libgit
Added more descriptive error message
2016-02-03 09:30:15 -07:00
Mike Place
0338f445d9 Merge pull request #30847 from terminalmage/bp-30844
Backport #30844 to 2015.8 branch
2016-02-03 09:26:46 -07:00
Mike Place
e51182495c Merge pull request #30860 from vutny/correct-doc-install-on-rhel
Correct installation documentation for RHEL-based distributions
2016-02-03 09:13:09 -07:00
Denys Havrysh
6648fd4c62 Correct links to Fedora COPR repositories 2016-02-03 14:38:50 +02:00
Denys Havrysh
083037fccc Remove duplicate post-installation tasks section 2016-02-03 14:29:25 +02:00
Glenn E. Bailey III
c3649023b5 Added more descriptive error message 2016-02-03 07:31:51 +00:00
Justin Findlay
d53a88762e modules.dpkg._get_pkg_info: handle older ubuntu
Fixes #30814.
2016-02-02 23:24:24 -07:00
Justin Findlay
d3c6732539 modules.dpkg._get_pkg_info: use pythonic initializers 2016-02-02 22:45:56 -07:00
Justin Findlay
17ae74dab1 utils.aws: use time lib to conver to epoch seconds
Fixes #30798.
2016-02-02 22:09:43 -07:00
Erik Johnson
58c4c01743 Add __role to master opts for gitfs integration tests 2016-02-02 21:58:50 -06:00
Erik Johnson
17dfec2dd4 Only perform initial fetch when running on a minion
This prevents the master's maintenance process from attempting to run a
fetch while GitBase.init_remotes() is in the process fetching a
newly-added remote.

We have proper locking in place, so there is no danger of a race
condition, but this does suppress the warning generated when an update
lock is in place at the time a fetch is attempted.
2016-02-02 21:58:50 -06:00
Erik Johnson
53c4b4aaa4 gitfs: add initial fetch to pygit2 and dulwich 2016-02-02 21:58:50 -06:00
Kris Raney
78f92e9ab2 Fix for gitfs ext_pillar on standalone minion
When configured to use a gitpython-based ext_pillar, salt-call --local (I don't have a master) was giving the error:
  Failed to checkout <branch> from git_pillar remote '<repo location>': remote ref does not exist
regardless of whether the branch existed or not. Poking around in the cache directory, I found that the cloned repository had a remote named 'origin' set, but no fetch had ever been done, so 'git checkout' would always fail. It doesn't know about any branches yet.

Adding the fetch here, immediately after creating the remote, resolves the problem.

I'm not totally sure this is the _correct_ fix as I'm not familiar with this code, and this code is used in many situations, not just minced. But I believe it to be harmless in the worst case, a redundant fetch.
2016-02-02 21:58:50 -06:00
jacobhammons
f1cf027308 Merge pull request #30841 from jacobhammons/release-notes
Release notes for 2015.8.5
2016-02-02 17:04:04 -07:00
Jacob Hammons
6d0562ef86 Release notes for 2015.8.5 2016-02-02 17:02:50 -07:00
Thomas S Hatch
f8ac6002d3 Merge pull request #30835 from terminalmage/issue30820
Integration test for #30820
2016-02-02 16:51:53 -07:00
jacobhammons
e0901854ce Merge pull request #30837 from jacobhammons/release-notes
Added known issue #30820 to release notes
2016-02-02 15:33:43 -07:00
Jacob Hammons
29e12a7fef Added known issue #30820 to release notes 2016-02-02 15:32:27 -07:00
Mike Place
b512c7757a Merge pull request #30832 from rallytime/fix-28790
Add grains modules to salt modindex
2016-02-02 14:47:46 -07:00
Mike Place
75db37a97d Merge pull request #30822 from rallytime/rabbitmq-user-state-fixes
Make sure setting list_user_permissions to ['', '', ''] doesn't stacktrace
2016-02-02 14:42:26 -07:00
Erik Johnson
ef14956db0 Integration test for #30820 2016-02-02 15:34:19 -06:00
Colton Myers
557766f20b Merge pull request #30833 from terminalmage/issue30820
Fix regression in scanning for state with 'name' param
2016-02-02 14:25:09 -07:00
Erik Johnson
be3b8e2be6 Fix regression in scanning for state with 'name' param
6d747df broke this by returing the name being searched for instead of
the state ID, causing the traceback found in #30820.

This fixes #30820 by returning the state ID and not the desired name.
2016-02-02 14:48:39 -06:00
rallytime
ca044dd201 Add grains modules to salt modindex
Fixes #28790
2016-02-02 13:35:49 -07:00
Mike Place
ec4e2bb9bb Merge pull request #30823 from yannis666/fix-for-mine-update-merge2
Fix for mine to merge configuration on update.
2016-02-02 13:21:24 -07:00
jacobhammons
d24b9f1ea1 Merge pull request #30827 from jacobhammons/release-2015.8
Version to 2015.8.4, added CVE 2016-1866 to release notes
2016-02-02 13:03:31 -07:00
Jacob Hammons
dfc1f7a57d Version to 2015.8.4, added CVE 2016-1866 to release notes 2016-02-02 13:02:19 -07:00
Colton Myers
f83845d7c3 Merge pull request #30813 from alprs/fix-pillar_merge_list_default
Properly set the default value for pillar_merge_lists
2016-02-02 12:53:51 -07:00
rallytime
272cc653ca Make sure setting list_user_permissions to ['', '', ''] doesn't stacktrace
And doesn't report changes on secondary state runs.

Fixes #28971
2016-02-02 12:46:26 -07:00
rallytime
a7afa7a368 Don't return a set() when checking for new tags in rabbitmq_user state
When attempting to reproduce the bug in #28971, the pyobjects rederer
errors and doesn't output the state properly when a set() is returned
via the rabbitmq_user._check_tags_changes function. This change fixes
that error and state output appears as intended.
2016-02-02 12:46:25 -07:00
Mike Place
a3feba4a26 Merge pull request #30826 from cachedout/fix_30682
Fix 30682
2016-02-02 12:40:05 -07:00
Mike Place
3b246db0b0 Fix stupid test 2016-02-02 12:39:24 -07:00
Mike Place
b25b845d05 Merge pull request #30818 from rallytime/bp-30790
Back-port #30790 to 2015.8
2016-02-02 11:57:55 -07:00
yannis
99c7c12aba Fix for mine to merge configuration on update.
This fix was previously applied to 2015.5.
It fixes #30722
2016-02-02 10:43:00 -08:00
Mike Place
3cb7a9ee54 Merge pull request #30815 from vutny/reactor-low-data-fix
Pick right user argument for updating reactor function's low data
2016-02-02 09:50:22 -07:00
Johannes Meixner
c7c66afd0c salt/modules/sysrc.py: Fix documentation for set_
set_ documentation was yank&pasted from remove without changing it.

Instead, give a proper example how to use sysrc.set.
2016-02-02 09:12:21 -07:00
Denys Havrysh
4d4d67f9ac Pick right user argument for updating reactor function's low data 2016-02-02 17:11:01 +02:00
Mike Place
36752906c4 Merge pull request #30747 from jfindlay/lxc_which
modules.lxc.running_systemd: use `command -v` not `which`
2016-02-02 07:54:17 -07:00
Andreas Lutro
ec34cabee8 Properly set the default value for pillar_merge_lists
Issue: #30809
Related PRs: #30062 #30458
2016-02-02 15:50:20 +01:00
Mike Place
8abb5b30ad Merge pull request #30800 from twangboy/chrome
Ability to handle special case installations
2016-02-02 07:25:44 -07:00
twangboy
fe0747c14e Fix another typo 2016-02-01 18:38:59 -07:00