Commit Graph

15719 Commits

Author SHA1 Message Date
Thomas S Hatch
5de7cd517f Merge pull request #6307 from s0undt3ch/hotfix/pylint-anomalous-backslash
Strings containing backslashes should either be escaped or raw strings.
2013-07-25 21:40:11 -07:00
Thomas S Hatch
99dfe0cb92 Start on state file tracking 2013-07-25 22:33:20 -06:00
Joseph Hall
bb3209ce81 Merge pull request #6320 from terminalmage/quickfix
Fix pylint compatibility in travis
2013-07-25 16:17:46 -07:00
Erik Johnson
8ef9155dcd Fix pylint compatibility in travis
See https://github.com/saltstack/salt/pull/6304#issuecomment-21590082
2013-07-25 17:51:25 -05:00
Joseph Hall
d1a769dae1 Merge pull request #6315 from basepi/pecl6214
Add parameter for forcing PECL versions, Fix #6214
2013-07-25 15:42:40 -07:00
Joseph Hall
f32f715305 Merge pull request #6319 from cvrebert/patch-4
pillar: specify explicit exception type in `except` clause
2013-07-25 15:41:46 -07:00
Joseph Hall
c8416c3edf Merge pull request #6318 from FireHost/fix_root_valid_id
Verify minion ids in pki_dir, not hardcoded path.
2013-07-25 15:41:01 -07:00
Joseph Hall
2d8d5e647a Merge pull request #6317 from chrisgilmerproj/develop
Allow space delimited lists for targeting
2013-07-25 15:40:34 -07:00
Chris Rebert
36382d1007 pillar: specify explicit exception type in except clause
************* Module salt.pillar
W0702:334,20:Pillar.render_pillar: No exception type(s) specified
2013-07-25 15:27:24 -07:00
Aaron Tygart
74649dd3bd Verify minion ids in pki_dir, not hardcoded path. 2013-07-25 17:19:58 -05:00
Chris Gilmer
11ac394a52 Fix command help text
Indicate that space delimited lists work
2013-07-25 15:00:13 -07:00
Chris Gilmer
ecce87a9a7 Allow split of list using spaces.
This change checks for comma existence and if its not there splits based on spaces.  Should have identical use as previously.  It also solves the problem of giving non-comma-delimited-output to salt from other programs.
2013-07-25 14:58:08 -07:00
Erik Johnson
a52773e940 Merge pull request #6316 from terminalmage/docstring-tweaks
Update mysql docstrings to reflect new features
2013-07-25 14:17:30 -07:00
Erik Johnson
ed6047c971 Update mysql docstrings to reflect new features 2013-07-25 16:16:13 -05:00
Colton Myers
645705e9b4 Add force to docstring 2013-07-25 15:08:00 -06:00
Colton Myers
3bacf6655c Fix line length in states/pecl.py 2013-07-25 15:05:00 -06:00
Colton Myers
00a654fe0f Add force parameter to pecl.install (forcing version), Fix #6214 2013-07-25 15:03:27 -06:00
Colton Myers
1f93ed9dbf Add force parameter to pecl.installed (for forcing version) 2013-07-25 15:02:06 -06:00
Pedro Algarvio
148eba6aef Merge pull request #6310 from EvaSDK/develop
Fix compatibility with older virtualenv revision, Fixes: #6309
2013-07-25 06:57:44 -07:00
Gilles Dartiguelongue
a2b01576a8 Fix compatibility with older virtualenv revision, closes: #6309 2013-07-25 15:34:59 +02:00
Pedro Algarvio
b235d11cfa Minor formatting fixes. 2013-07-25 08:46:38 +01:00
Pedro Algarvio
67c0fb1811 Strings containing backslashes should either be escaped or raw strings. 2013-07-25 08:37:54 +01:00
Thomas S Hatch
ea98ba74b7 Merge pull request #6305 from terminalmage/issue5910
Fix minion traceback when pillar SLS is malformed
2013-07-24 22:44:39 -07:00
Erik Johnson
a36546e5b2 Fix minion traceback when pillar SLS is malformed
When pillar data is rendered for use by pillar.get, SLS that does not
render to a dictionary results in a traceback on the minion. This commit
resolves that traceback.

Fixes #5910.
2013-07-24 22:51:35 -05:00
Joseph Hall
66de441abf Merge pull request #6304 from terminalmage/issue6299
yum: Allow 32bit pkgs in arches other than i686
2013-07-24 19:06:40 -07:00
Erik Johnson
aae8ff2ee7 yum: Allow 32bit pkgs in arches other than i686
The yum providers previously only supported 32bit packages that were for
the i686 architecture. This adds support for any iX86 arch.

Fixes #6299.
2013-07-24 20:49:51 -05:00
David Boucha
604a387f0c Merge pull request #6302 from UtahDave/develop
Add missing colons in docstrings
2013-07-24 16:23:23 -07:00
Joseph Hall
a436fea882 Merge pull request #6301 from cvrebert/patch-3
Presumable fix for what's breaking Travis
2013-07-24 16:23:18 -07:00
David Boucha
ff3a3234ce Add missing colons in docstrings 2013-07-24 17:22:38 -06:00
Chris Rebert
4141007511 Presumable fix for what's breaking Travis
************* Module salt.ssh
E0602:261,45:Single.highstate_seed: Undefined variable 'target'
2013-07-24 15:37:41 -07:00
Thomas S Hatch
da46fc6605 Add file.missing state 2013-07-24 10:02:17 -06:00
Thomas S Hatch
a8148a1558 Merge pull request #6296 from felskrone/cmditernoblock_pass_on_tgt
cmd_iter_no_block did not pass on tgt to get_iter_returns(). That makes ...
2013-07-24 08:44:53 -07:00
Joseph Hall
4375595b16 Merge pull request #6295 from s0undt3ch/hotfix/pip-tests
Test if `--pre` option argument ends up in the resulting command line for `pip.install`
2013-07-24 05:51:40 -07:00
Pedro Algarvio
bb4d593b5f Return an empty dictionary instead of ret which is not yet defined at this stage. 2013-07-24 08:54:32 +01:00
Volker Schwicking
36da54246e cmd_iter_no_block did not pass on tgt to get_iter_returns(). That makes the
saltmaster always query ALL minions with saltutil.find_job because
get_iter_returns default to tgt='*'.
2013-07-24 09:10:51 +02:00
Pedro Algarvio
98c63b9671 Test if --pre option argument ends up in the resulting command line for pip.install. 2013-07-24 08:03:50 +01:00
Thomas S Hatch
b8dc7f35a4 Merge pull request #6293 from terminalmage/issue6292
Limit pkg.latest to 1 refresh per run unless overridden
2013-07-23 23:17:24 -07:00
Thomas S Hatch
3bca9cec38 Merge pull request #6294 from kfdm/extra-grain-functions
Add append, remove, and delval to the grains module
2013-07-23 23:16:30 -07:00
Thomas S Hatch
7000ab9d20 Fix #5928
@basepi, this needs to be in 0.16.1
2013-07-24 00:07:29 -06:00
Paul Traylor
8fa9bfcade Add grains.append, grains.remove, and grains.delval methods to the grains module 2013-07-23 21:15:20 -07:00
Erik Johnson
3a95a4d48a Limit pkg.latest to 1 refresh per run unless overridden
This fixes #6292 by moving the rtag check to the call to
pkg.latest_version, and never refreshing if/when pkg.install is run.
2013-07-23 22:35:49 -05:00
Joseph Hall
c487033fe4 Merge pull request #6291 from mafrosis/pip_pre_releases
Allow pip to install pre-release versions
2013-07-23 18:37:40 -07:00
mafro
7b72d8907d Allow pip to install pre-release versions refs pypa/pip@4d5c5f8f 2013-07-24 01:28:53 +00:00
Joseph Hall
bc2c24e366 Merge pull request #6290 from terminalmage/issue6277
ssh_auth: detect when source file has 0 valid keys
2013-07-23 18:24:34 -07:00
Joseph Hall
abbcf182de Merge pull request #6289 from cvrebert/patch-2
ssh/__init__.py: fix indentation
2013-07-23 15:56:43 -07:00
Pedro Algarvio
c4e84576c2 Merge pull request #6288 from cvrebert/patch-1
couchdb_return: Fix spacing to make pylint happier
2013-07-23 15:39:48 -07:00
Erik Johnson
e2dd93b717 ssh_auth: detect when source file has 0 valid keys
If an improperly-formatted file is used as the source file for an
ssh_auth.present state, the state incorrectly reports that all keys in
the file are present. This is because the functions that check the
source file only return keys that need to be changed, and with no valid
keys, there is nothing to change.

This commit detects when there are no valid keys found, and reports this
in the state output.

Additionally, since one of the ways that this edge case can be triggered
is if a public key from PuTTYgen is used, instructions have been added
to the ssh_auth.present docstring explaining how to obtain the
OpenSSH-compatible public key for the corresponding private key
generated by PuTTYgen.

Fixes #6277.
2013-07-23 17:39:47 -05:00
Chris Rebert
516ddbba6f ssh/__init__.py: fix indentation 2013-07-23 15:16:32 -07:00
Chris Rebert
c6f0b6820b couchdb_return: Fix spacing to make pylint happier 2013-07-23 15:14:56 -07:00
Seth House
1ad733a2c0 Added missing 's' in cross-reference 2013-07-23 16:07:03 -06:00