Commit Graph

26098 Commits

Author SHA1 Message Date
Thomas S Hatch
c61690cdcf Merge pull request #10468 from terminalmage/gitfs-mountpoints
Add gitfs "mountpoints" and per-remote config params
2014-02-17 14:48:40 -07:00
Thomas S Hatch
c54208c0d4 Merge pull request #10463 from Stelminator/minion_loop_logic_2014_02_14
MultiMinion loop fixes
2014-02-17 14:47:28 -07:00
Thomas S Hatch
a01bdc1f49 Merge pull request #10456 from basepi/mongovirtual10430
Fixes for the mongodb_user state module, Fixes #10430
2014-02-17 14:45:47 -07:00
Thomas S Hatch
cafd5c66dd Merge pull request #10441 from SaveTheRbtz/flopen
flopen improvements
2014-02-17 14:45:19 -07:00
Thomas S Hatch
5aa2be9c64 Merge pull request #10439 from mgwilliams/cmd
add "creates" kwarg to cmd.run
2014-02-17 14:42:17 -07:00
Thomas S Hatch
bed175826e Merge pull request #10436 from dlanderson/environ_modules
Add state and execution modules for getting/setting salt process environ...
2014-02-17 14:39:38 -07:00
Thomas S Hatch
81790838fa tmp stub out test until we can find a better home for it 2014-02-17 14:31:41 -07:00
Thomas S Hatch
85eed30167 Merge pull request #10409 from Vye/gitfs_fix_url_change
Adds support for updating cached git repo url.
2014-02-17 14:30:42 -07:00
Seth House
dc0ff9cd6c Merge pull request #10506 from illumin-us-r3v0lution/patch-2
tweak code-block docstring in salt.client.Caller
2014-02-17 10:22:25 -07:00
illumin-us-r3v0lution
232d74dc6e tweak code-block docstring in salt.client.Caller
this correction is attributed to mgw in #salt
2014-02-17 12:06:10 -05:00
Joseph Hall
4c080f00ef Merge pull request #10505 from zellyn/patch-1
Update walkthrough.rst
2014-02-17 09:42:18 -07:00
Zellyn Hunter
8a66cb315c Update walkthrough.rst
"proven ability" and "proven" were distractingly repetitive in this paragraph.
2014-02-17 07:58:38 -08:00
Joseph Hall
0ef3989179 Merge pull request #10499 from makinacorpus/pgsql
Fix roles query
2014-02-17 06:10:56 -07:00
Joseph Hall
06c3e5bbe2 Merge pull request #10501 from holmboe/enforce-open-except
Wrap file open in try-except
2014-02-17 06:06:51 -07:00
Henrik Holmboe
1cf50d3272 Wrap file open in try-except
In setenforce(), similar to getenforce()
2014-02-17 13:57:08 +01:00
Pedro Algarvio
327364e0ba Merge pull request #10495 from terminalmage/ports-reload-modules
Reload modules when a ports state installs packages
2014-02-17 12:53:37 +00:00
Mathieu Le Marec - Pasquet
1a4ca7ed6d Fix roles query
This fixes #10437.
2014-02-17 09:21:43 +01:00
Erik Johnson
de5aff655d Reload modules when a ports state installs packages
Since ports states modify the package database, the pkg database should
be reloaded when a port is installed.
2014-02-16 22:02:26 -06:00
Pedro Algarvio
2cd772cf59 Merge pull request #10491 from gtmanfred/glusterfs
Clean up lint changes
2014-02-16 18:12:33 +00:00
Daniel Wallace
0aa968ba62 Clean up lint changes
act_peer wasn't included enough.  Also cleared out **kwargs.
2014-02-16 11:59:06 -06:00
Joseph Hall
0332be8b48 Merge pull request #10489 from s0undt3ch/develop
Lint fixes
2014-02-16 10:03:13 -07:00
Pedro Algarvio
ab2506cb50 Remove un-used import. 2014-02-16 17:00:02 +00:00
Pedro Algarvio
43bdc4caf9 Remove unused import. Don't shaddow peer(). 2014-02-16 16:59:05 +00:00
Joseph Hall
8a3d0fa8f6 Merge pull request #10488 from s0undt3ch/develop
Unify the minimal libcloud version requirement.
2014-02-16 09:40:37 -07:00
Pedro Algarvio
67778949e0 The minimal requirement for apache-libcloud is now 0.14.0. 2014-02-16 16:38:02 +00:00
Pedro Algarvio
17c3d20974 Unify the minimal libcloud version requirement. 2014-02-16 16:32:19 +00:00
Joseph Hall
6692c242a9 Merge pull request #10486 from gtmanfred/glusterfs
Add glusterfs state and module
2014-02-16 09:26:08 -07:00
Daniel Wallace
0ac447f1e0 Clean up glusterfs module and state
Cleaning up a few small things.
2014-02-16 09:30:22 -06:00
Joseph Hall
7d6fcf8ff5 Merge pull request #10487 from obestwalter/develop
use the value of __virtualname__ instead of a string
2014-02-16 06:32:16 -07:00
Oliver Bestwalter
5d52a00f80 use the value of __virtual__ instead of a string 2014-02-16 14:02:02 +01:00
Pedro Algarvio
b046a6f4b1 Merge pull request #10483 from gtmanfred/fixlocal
[salt.cloud] master_minion_name referenced before assignment
2014-02-16 12:47:59 +00:00
Daniel Wallace
f73cba3e0b Fix lint errors for gluster modules 2014-02-16 06:07:52 -06:00
Daniel Wallace
a76f4343dd Make peers plural for glusterfs 2014-02-16 04:05:50 -06:00
Daniel Wallace
e510c287c2 Add peered status 2014-02-16 02:57:10 -06:00
Daniel Wallace
5308fd9119 Add gluster cluster state 2014-02-16 02:22:52 -06:00
Daniel Wallace
0085232d1d [salt.cloud] master_minion_name referenced before assignment
Fixes error caused by 42ca06c9

[ERROR   ] There was a query error: local variable 'master_minion_name' referenced before assignment
Traceback (most recent call last):
  File "/usr/lib/python2.7/site-packages/salt/cloud/cli.py", line 389, in run
    ret = mapper.run_map(dmap)
  File "/usr/lib/python2.7/site-packages/salt/cloud/__init__.py", line 1611, in run_map
    if name in (master_name, master_minion_name):
UnboundLocalError: local variable 'master_minion_name' referenced before assignment
2014-02-16 01:27:08 -06:00
Daniel Wallace
1d08acb98b Add start method to glusterfs module 2014-02-16 01:07:09 -06:00
Daniel Wallace
927af32d3e Add initial glusterfs module 2014-02-16 00:51:06 -06:00
Joseph Hall
519ceec54c Merge pull request #10465 from gtmanfred/filesystems
Allow formatting of partitions
2014-02-15 19:46:21 -07:00
Daniel Wallace
c32e34fc31 Allow formatting partitions
Be able to have a partition as a specific filesystem state.  Only
included inode_size because that is the one I need right now.  We can
add more later.
2014-02-15 18:46:44 -06:00
Erik Johnson
d2354e6261 Fix for when dulwich-managed repos get in bad state
This commit logs an error and deletes the master cachedir if the repo
cachedir gets into a bad state.
2014-02-15 16:25:17 -06:00
David Boucha
c9ebb2dcf9 Merge pull request #10476 from s0undt3ch/hotfix/jinja-sequence-filter
Jinja's sequence filter does not need to be an extension.
2014-02-15 11:22:28 -07:00
Pedro Algarvio
7a42bf24fc Jinja's sequence filter does not need to be an extension. 2014-02-15 17:26:35 +00:00
Joseph Hall
da6f73fbb2 Merge pull request #10474 from s0undt3ch/hotfix/lint
PyLint quietly ignore it!
2014-02-15 09:37:13 -07:00
Pedro Algarvio
197966ca58 Tell PyLint not to complain about ignored files 2014-02-15 16:30:42 +00:00
Pedro Algarvio
a009d6b80a Make Pylint ignore file 2014-02-15 16:30:23 +00:00
Joseph Hall
50f3df8114 Merge pull request #10460 from s0undt3ch/hotfix/make-master-local-minion
Allow the new master's minion to answer to local master
2014-02-15 07:22:26 -07:00
Pedro Algarvio
4f6a3e36af Remove first person reference 2014-02-15 14:17:21 +00:00
Pedro Algarvio
3436863f41 Add exmaple of any minion responding to local master 2014-02-15 14:17:21 +00:00
Pedro Algarvio
c27bb8b4a0 Remove extra space 2014-02-15 14:17:21 +00:00