Commit Graph

59284 Commits

Author SHA1 Message Date
Mike Place
d9c32011b4 Merge pull request #29076 from RealKelsar/2015.8
We can't query installed use flags for a non installed pkg
2015-11-23 09:19:40 -07:00
Nicole Thomas
1931870f26 Merge pull request #29097 from rallytime/bp-29070
Back-port #29070 to 2015.8
2015-11-22 10:03:04 -07:00
Quan Tong Anh
3b202efadc boto_ec2: missing region when checking existence of an EC2 instance 2015-11-21 08:57:24 -07:00
Nicole Thomas
bb28b9186b Merge pull request #29090 from gtmanfred/2015.8
clean up novaclient module
2015-11-21 08:43:58 -07:00
Nicole Thomas
4ff54c6429 Merge pull request #29095 from terminalmage/pygit2-warning
Add warning about pygit2 API instability
2015-11-21 08:38:59 -07:00
Nicole Thomas
27160b0454 Merge pull request #28919 from cro/hue_proxy_backport
Update Philips Hue proxy minion to support __proxy__ instead of proxymodule stored in __opts__
2015-11-21 08:31:36 -07:00
Erik Johnson
139f5ba4c3 Add warning about pygit2 API instability 2015-11-20 22:34:58 -06:00
Daniel Wallace
2aab45f9d2 clean up novaclient module
get the client a different way, and add specifying the version.
2015-11-20 20:18:23 -06:00
Pedro Algarvio
88c0354c0c Merge pull request #29065 from cachedout/issue_28810
Handle failures inside python's inspect if a module is reloaded
2015-11-20 18:10:42 +00:00
Tetja Rediske
f3d1ba1509 We can't query installed use flags for a non installed pkg. Also one if is enough... 2015-11-20 17:05:55 +01:00
Mike Place
4767503eb2 Remove trailing whitespace 2015-11-20 08:53:27 -07:00
Tetja Rediske
96566d3060 We can't query installed use flags for a non installed pkg 2015-11-20 12:40:55 +01:00
Mike Place
c5b667f048 Handle failures inside python's inspect if a module is reloaded
Python has a known issue wherein calls to the inspect module which traverse the frame stack will fail if a module has been reloaded.

This caused a serious bug wherein certain uses of the depends decorator would fail hard and prevent the salt module from being initialized and loaded.

This works around that by simply ignoring the inspect failure.

cc: @sjorge (This may impact your fix for esky in #25946. Please have a look.)
2015-11-19 16:30:17 -07:00
Mike Place
714ef8ff27 Merge pull request #29057 from lyft/file-manage-local-source-list
Add local file support for file.managed source list
2015-11-19 14:57:34 -07: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
Paul Fisher
3d7aa19cd8 Support local files in list of sources 2015-11-18 15:55:52 -08:00
Paul Fisher
d175061c5d Add tests for file.source_list with local files 2015-11-18 15:55:44 -08:00
Paul Fisher
4f8e2a30fe Update documentation to clarify URL support for lists of sources with file.managed 2015-11-18 15:55:16 -08: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