Erik Johnson
1e6c46f554
pygit2: Properly resolve base saltenv from tag ref
...
Fixes #27432 .
2015-11-20 02:39:44 -06:00
Erik Johnson
0c592ab552
Support string whitelist/blacklist
2015-11-20 02:38:27 -06:00
Erik Johnson
744487864d
Fix base branch detection for git_pillar
...
Resolves #29015 .
2015-11-20 01:19:44 -06:00
Erik Johnson
1cd9a4d1b4
Add some debug logging for git_pillar
...
This adds logging showing which directory and which environment are
being processed for each pillar_dir being evaluated.
2015-11-20 01:18:20 -06:00
Erik Johnson
fac588c0bb
Add HEAD ref in git_pillar/winrepo checkout
...
This works around a traceback which occurs due to an API change in pygit
0.21, which occurs when attempting to check out a branch other than the
default. salt.utils.gitfs doesn't actually clone the repository, it adds
a remote and fetches it, so the local ref for HEAD is not present.
pygit2 tries to reference it in the process of checking out a
non-default branch, resulting in a KeyError.
This workaround checks for the existence of the local ref corresponding
to HEAD, and creates it if it was not present.
Fixes #28311 .
2015-11-20 00:52:46 -06:00
Mike Place
f4f43381fc
Merge pull request #29017 from jfindlay/pager_util
...
pagerduty runner: add missing salt.utils import
2015-11-19 12:28:35 -07:00
Mike Place
1c61bce0a6
Merge pull request #29039 from alprs/feature-virtualenv_pip_pkgs
...
Allow passing list of pip packages to virtualenv.managed
2015-11-19 12:13:50 -07:00
Mike Place
b692ab1cfb
Merge pull request #29047 from schwing/fix-gpg-exception
...
Fix salt.modules.gpg.import_key exception: 'GPG_1_3_1 referenced before assignment'
2015-11-19 12:07:36 -07:00
Mike Place
b4fc2f28a4
Merge pull request #29050 from terminalmage/issue29015
...
Make git_pillar global config option docs more prominent
2015-11-19 12:06:38 -07:00
Mike Place
4b3b2fe1e7
Merge pull request #29048 from nmadhok/patch-1
...
Fix incorrect debug log statement
2015-11-19 12:04:10 -07:00
Mike Place
e52c117368
Merge pull request #29024 from jfindlay/run_test
...
cache runner test: add new unit tests
2015-11-19 12:02:54 -07:00
Mike Place
bcec8d8608
Merge pull request #28967 from cro/fx2_switch
...
Fix some issues with password changes
2015-11-19 11:57:39 -07:00
Erik Johnson
20da057a94
Make git_pillar global config option docs more prominent
2015-11-19 11:52:45 -06:00
C. R. Oldham
67b5b9b8d2
Add docs on automatic lockout on failed auth attempts.
2015-11-19 10:02:21 -07:00
C. R. Oldham
8a3cea4d95
Lint.
2015-11-19 09:53:04 -07:00
Nitin Madhok
9489d6c3b6
Update vmware.py
2015-11-19 11:18:17 -05:00
John Schwinghammer
813f6e6808
Fix 'GPG_1_3_1 referenced before assignment'
...
- Fix gpg.import_key() exception:
"local variable 'GPG_1_3_1' referenced before assignment"
- Update the unit tests to test both the gpg.GPG_1_3_1=True and
gpg.GPG_1_3_1=False cases.
2015-11-19 09:27:46 -06:00
Andreas Lutro
f9bff51382
allow passing list of pip packages to virtualenv.managed
2015-11-19 10:27:54 +01:00
Justin Findlay
0c0bce3ea6
cache runner test: add new unit tests
2015-11-18 16:33:46 -07:00
Mike Place
14b5d0ed0f
Merge pull request #29020 from basepi/salt-ssh.nodegroups.8516
...
[2015.8] Add special list-only nodegroup support to salt-ssh
2015-11-18 14:15:50 -07:00
Mike Place
89801b172a
Merge pull request #28970 from terminalmage/issue28911
...
Properly handle non-string saltenvs
2015-11-18 13:38:41 -07:00
Colton Myers
6433abf36f
Rename ssh_nodegroups to ssh_list_nodegroups
2015-11-18 13:09:29 -07:00
Colton Myers
bd8487b3b9
Properly save minion list in local_cache for ssh jobs
2015-11-18 13:01:56 -07:00
Mike Place
83c54351c9
Merge pull request #28959 from rallytime/fix-28945
...
Add blade password example and make note of timeout
2015-11-18 12:39:04 -07:00
Colton Myers
4b1bf7d5e2
Add support for comma separated list matching in salt-ssh
2015-11-18 12:02:20 -07:00
Justin Findlay
5cc06207fe
pagerduty runner: add missing salt.utils import
...
Fixes #28981 .
2015-11-18 12:01:42 -07:00
Colton Myers
65c6528cbc
Add "nodegroup" matching to salt-ssh
...
Uses the special ssh_nodegroups config value, which only takes lists,
not normal compound matching.
2015-11-18 12:00:22 -07:00
Colton Myers
688a78c08c
Add new ssh_nodegroups config
2015-11-18 11:59:36 -07:00
rallytime
2f326b57bf
Clarify chassis password functionality
2015-11-18 11:33:28 -07:00
Mike Place
d8dc81bb2c
Merge pull request #29000 from kiorky/2015.8_lxc
...
[Mergeable] Fix up LXC
2015-11-18 11:02:47 -07:00
Mike Place
eedd50e7c3
Merge pull request #29014 from jfindlay/sysctl_col
...
systemd module: remove unneeded col command
2015-11-18 10:58:59 -07:00
Justin Findlay
d75e4d5d21
systemd module: line wrap function comment
2015-11-18 10:08:21 -07:00
Justin Findlay
960d2b936d
systemd module: remove unneeded col command
...
Fixes #28995 .
2015-11-18 10:07:36 -07:00
Mathieu Le Marec - Pasquet
a4d197821a
LXC: doc
2015-11-18 13:34:56 +01:00
Mathieu Le Marec - Pasquet
43fb0eff02
lxc: remove useless and error prone uses_systemd knob
2015-11-18 13:34:53 +01:00
Mathieu Le Marec - Pasquet
7ec08cd41c
Fix bootstrap delay kwarg exchange
...
Signed-off-by: Mathieu Le Marec - Pasquet <kiorky@cryptelium.net>
2015-11-18 13:08:20 +01:00
Colton Myers
ac85cfdbd0
Merge pull request #28983 from basepi/merge-forward-2015.8
...
[2015.8] Merge forward from 2015.5 to 2015.8
2015-11-17 17:49:36 -07:00
Colton Myers
f1c80ab943
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
salt/utils/schedule.py
2015-11-17 16:18:12 -07:00
C. R. Oldham
04095e3b74
Prevent stacktrace if something goes wrong retrieving inventory
2015-11-17 15:39:57 -07:00
C. R. Oldham
e7cbce15a5
Don't need to get grains at init time here now that we are confirming username and password differently.
2015-11-17 15:26:09 -07:00
C. R. Oldham
e42100cf8a
Switch from admin_password and fallback_admin_password to a list of passwords to try.
2015-11-17 15:20:55 -07:00
Mike Place
f172a0ee03
Merge pull request #28969 from rallytime/bp-28825
...
Back-port #28825 to 2015.8
2015-11-17 13:43:30 -07:00
Erik Johnson
ec64ec85d6
Force file_roots environments to be strings
2015-11-17 14:15:36 -06:00
Erik Johnson
b2690140c7
Properly handle non-string saltenvs
...
Force the saltenv to be a string, preventing AttributeError exceptions
in the various backends if someone passes an int/float as a saltenv.
Fixes #28911 .
2015-11-17 14:15:36 -06:00
Pedro Algarvio
40f4ac5b21
Add missing import
2015-11-17 13:07:06 -07:00
Pedro Algarvio
2c43da1578
Take into account a pygit2 bug
2015-11-17 13:07:06 -07:00
C. R. Oldham
4b382e977d
Add 'versionadded'
2015-11-17 11:57:26 -07:00
rallytime
3614a88811
Add blade password example and make note of timeout
...
Fixes #28945
2015-11-17 10:13:24 -07:00
Mike Place
1e9214f4e4
Merge pull request #28787 from chrigl/fix-28784
...
closes #28784
2015-11-17 08:54:04 -07:00
Mike Place
edd26d763a
Merge pull request #28949 from whiteinge/sync-sdb
...
Add sync_sdb execution function
2015-11-17 08:35:38 -07:00
