Commit Graph

24462 Commits

Author SHA1 Message Date
Thomas S Hatch
31cd3e6cf4 Update the state to use the changed api for ini 2014-01-03 10:04:36 -07:00
Thomas S Hatch
e3459da232 Update ini_manage api
This takes out the redundant ini refs in function names, fills in the
CLI Examples and underscores out the classes so they don't show up as
function in the remote execution system, also renames ini_manage to just ini
2014-01-03 09:41:50 -07:00
Thomas S Hatch
53e11bd8f4 Merge pull request #9524 from CSSCorp/develop
added module for managing ini files
2014-01-03 08:27:51 -08:00
Thomas S Hatch
551f7f97bf Merge pull request #9562 from bbinet/salt-thin-singlefile-module-support
Fix support for additional modules when these are single file modules
2014-01-03 08:23:53 -08:00
Thomas S Hatch
3823d0ad27 Merge pull request #9561 from rhormaza/bugfix/keystone-module-hasattr-issue
Fixing two tiny bugs in keystone module.
2014-01-03 08:22:51 -08:00
Thomas S Hatch
951920a1b7 Merge pull request #9559 from s0undt3ch/issues/9535-no-bootstrap-auto-download
Only update the bootstrap script on request. Fixes #9535.
2014-01-03 08:21:49 -08:00
Thomas S Hatch
50da092904 Merge pull request #9548 from cvrebert/patch-2
digital_ocean._get_node: rm unused 'location' arg
2014-01-03 08:21:25 -08:00
Thomas S Hatch
c7641cc8cf Merge pull request #9543 from hulu/Lots-of-Irritating-Superfluous-Parentheses
fix numerous pylint C0325 (superfluous-parens) warnings
2014-01-03 08:20:31 -08:00
Thomas S Hatch
fef311cf26 Merge pull request #9508 from dmyerscough/develop
Fix: #6346 - ssh propagate removals from authorized_keys
2014-01-03 08:15:23 -08:00
Bruno Binet
90942f4e46 Fix support for additional modules when these are single file modules
For example, to generate a thin.tgz tarball that is able to use dockerio salt
state, you would do:
```
>>> salt.utils.thin.gen_thin('/tmp', 'msgpack,docker,websocket,six,requests', True)
```
But it would add a wrong path to the six.py module in the thin.tgz tarball
because six.py is a single file python module.
This pull request fixes this.

(refs #9337)
2014-01-03 15:10:25 +01:00
Raul Hormazabal
44f3648ee4 Fixing two tiny bugs in keystone module. The hasattr() was used with a dict instead of an object. New change uses the getattr() call which is IMHO safer 2014-01-03 22:39:34 +11:00
Akilesh
7811a1d7ba state module for ini_manage and ini_option_set return value fix 2014-01-03 16:17:16 +05:30
Pedro Algarvio
0998b541de Merge pull request #9558 from cvrebert/patch-1
memcached.replace(): avoid shadowing status() func
2014-01-02 17:26:24 -08:00
Pedro Algarvio
ad54eca1ab Only update the bootstrap script on request. Fixes #9535. 2014-01-03 01:24:17 +00:00
Chris Rebert
04725e6487 memcached.replace(): avoid shadowing status() func
************* Module salt.modules.memcached
salt/modules/memcached.py:198: [W0621(redefined-outer-name), replace] Redefining name 'status' from outer scope (line 68)
2014-01-02 17:21:16 -08:00
Pedro Algarvio
ca79876787 Merge pull request #9553 from s0undt3ch/develop
Use testing config files
2014-01-02 17:06:25 -08:00
Pedro Algarvio
626cfa9456 Merge pull request #9557 from hulu/copyedit-zcbuildout
copyedit zcbuildout module
2014-01-02 17:05:55 -08:00
Pedro Algarvio
125c028299 Correct phrase. Thanks @SEJeff.
Double to single quotes.
2014-01-03 01:04:43 +00:00
Pedro Algarvio
68f26f1176 Don't expect salt to be installed to run the tests.
Use the testing configuration files.
2014-01-03 01:04:43 +00:00
Chris Rebert
220a91f659 copyedit zcbuildout module 2014-01-02 17:03:12 -08:00
Pedro Algarvio
2b3a064cea Merge pull request #9555 from cvrebert/patch-5
modules.zcbuildout.run_buildout: fix docstring typo
2014-01-02 16:55:45 -08:00
Chris Rebert
d151b3b70e modules.zcbuildout.run_buildout: fix docstring typo 2014-01-02 16:54:05 -08:00
Pedro Algarvio
5c9a865b1e Merge pull request #9551 from cvrebert/patch-4
modules.yumpkg5._parse_pkginfo(): avoid shadowing
2014-01-02 16:50:30 -08:00
Pedro Algarvio
8dd783ac62 Merge pull request #9549 from cvrebert/patch-3
digital_ocean.script(): rename local var to avoid shadowing
2014-01-02 16:50:01 -08:00
Pedro Algarvio
c6c04b0bd5 Merge pull request #9544 from cvrebert/patch-1
remotes_on_local_tcp_port(): trivial simplification of condition
2014-01-02 16:49:12 -08:00
Pedro Algarvio
e55fa8e82f Merge pull request #9542 from cachedout/unit-tests
Unit tests
2014-01-02 16:43:53 -08:00
Chris Rebert
11d55bcfaf modules.yumpkg5._parse_pkginfo(): avoid shadowing
************* Module salt.modules.yumpkg5
salt/modules/yumpkg5.py:74: [W0621(redefined-outer-name), _parse_pkginfo] Redefining name 'version' from outer scope (line 227)
2014-01-02 16:42:35 -08:00
Pedro Algarvio
baa3a4b8cf Remove hardcoded version, we're regex matching. 2014-01-03 00:40:45 +00:00
Chris Rebert
39b4ef90c9 digital_ocean.script(): rename local var to avoid shadowing
************* Module salt.cloud.clouds.digital_ocean
salt/cloud/clouds/digital_ocean.py:520: [W0621(redefined-outer-name), script] Redefining name 'script' from outer scope (line 516)
2014-01-02 16:31:58 -08:00
Chris Rebert
5bf5db0ddd digital_ocean._get_node: rm unused 'location' arg
salt/cloud/clouds/digital_ocean.py:543: [W0613(unused-argument), _get_node] Unused argument 'location'
2014-01-02 16:29:46 -08:00
Pedro Algarvio
daecfde60c Merge pull request #9545 from cvrebert/patch-2
modules.mount.active(): fix FreeBSD check
2014-01-02 16:14:28 -08:00
Pedro Algarvio
6fb99b3d8a Merge pull request #9546 from hulu/network-tuples-fix
utils.network._interfaces_ipconfig(): fix botched singleton tuples
2014-01-02 16:12:33 -08:00
Chris Rebert
8eab92027f utils.network._interfaces_ipconfig(): fix botched singleton tuples
Python 2.7.6 (default, Nov 11 2013, 11:11:46)
>>> # Parentheses don't make tuples. Commas do that.
>>> ('Subnet Mask') == 'Subnet Mask' != ('Subnet Mask',)
True
>>> x = ('Subnet Mask')
>>> type(x)
<type 'str'>
>>> y = ('Subnet Mask',)
>>> type(y)
<type 'tuple'>
>>> # Why this went unnoticed:
>>> key = 'Subnet Mask'
>>> key in ('Subnet Mask')
True
>>> # Why this is problematic:
>>> key = 'Mask'
>>> key in ('Subnet Mask')
True
2014-01-02 15:56:50 -08:00
Chris Rebert
a4b925e71c modules.mount.active(): fix FreeBSD check 2014-01-02 15:48:10 -08:00
Chris Rebert
fb191ddafd utils.network.remotes_on_local_tcp_port: trivial simplification of condition 2014-01-02 15:45:17 -08:00
Chris Rebert
88848cf565 fix numerous pylint C0325 (superfluous-parens) warnings
"Unnecessary parens after 'XXX' keyword"
2014-01-02 15:33:07 -08:00
Mike Place
cb2abcb796 Pylint fixes. 2014-01-02 16:28:19 -07:00
Mike Place
2e20bf99a3 Client testing
* Minor spelling and doc fixes to client module
 * Unit testing client module.
2014-01-02 16:23:16 -07:00
Seth House
d6dd60af3a Added note that docs are for the development version 2014-01-02 15:40:57 -07:00
Seth House
fd099aaa50 Removed old/unused rST substitution 2014-01-02 15:40:57 -07:00
Seth House
4c0798052f Merge pull request #9536 from whiteinge/npm-version-examples
Added explicit examples of how to use versions with npm
2014-01-02 14:40:35 -08:00
Thomas S Hatch
a48bf4e5a3 Merge pull request #9538 from makinacorpus/jenkins-stuff
configurable salt git url for jenkins
2014-01-02 13:47:14 -08:00
Mathieu Le Marec - Pasquet
0e430e531d configurable salt git url for jenkins 2014-01-02 22:46:12 +01:00
Thomas S Hatch
e9c7038b3c Merge pull request #9537 from s0undt3ch/develop
Update regex to new versioning scheme.
2014-01-02 13:14:01 -08:00
Pedro Algarvio
77e74caf3a Update regex to new versioning scheme. 2014-01-02 21:08:57 +00:00
Thomas S Hatch
15c99f37c0 Set version to 2014.1.0 2014-01-02 13:57:31 -07:00
Pedro Algarvio
20dc11be48 Convert file from dos line endings to unix line endings 2014-01-02 20:52:20 +00:00
Seth House
80a45950e3 Added explicit examples of how to use versions with npm 2014-01-02 13:46:23 -07:00
Joseph Hall
b45a594f6b Merge pull request #9533 from timoguin/develop
Added info about DigitalOcean "Applications" to cloud docs
2014-01-02 12:33:38 -08:00
Thomas S Hatch
78b009537a Merge pull request #9534 from s0undt3ch/hotfix/virtualenv-know-binaries
The virtualenv binary can have multiple CLI names.
2014-01-02 12:33:10 -08:00