valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
26,342 Commits 24 Branches 182 Tags 341 MiB
f325ddc1a4
Commit Graph

26342 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Cory Zue
067341f579 workaround for bad output format dpkg-query command 
fixes the following error trace:

  File "/usr/lib/pymodules/python2.7/salt/state.py", line 1258, in call
    *cdata['args'], **cdata['kwargs'])
  File "/usr/lib/pymodules/python2.7/salt/states/pkg.py", line 421, in installed
    fromrepo=fromrepo, **kwargs)
  File "/usr/lib/pymodules/python2.7/salt/states/pkg.py", line 108, in _find_install_targets
    cur_pkgs = __salt__['pkg.list_pkgs'](versions_as_list=True)
  File "/usr/lib/pymodules/python2.7/salt/modules/apt.py", line 609, in list_pkgs
    [cols[x] for x in (0, 2, 3, 4, 5)]
IndexError: list index out of range
 2014-02-17 16:14:48 -06:00
Thomas S Hatch
3016ab134a Merge pull request #10512 from s0undt3ch/hotfix/salt.states.saltmod 
[MULTIPLE PRs] salt.states.saltmod
 2014-02-17 15:02:52 -07:00
Thomas S Hatch
7207f9c179 Merge pull request #10502 from kadel/doc-fixes 
doc: fix references in salt.modules.pkg
 2014-02-17 14:55:55 -07:00
Thomas S Hatch
ab2f751f7f Merge pull request #10493 from s0undt3ch/develop 
Update to latest bootstrap script. v2014.02.16
 2014-02-17 14:55:37 -07:00
Thomas S Hatch
a5f418053a Merge pull request #10484 from stas/develop 
Salt ssh will overwrite the minion ID based on gathered data.
 2014-02-17 14:55:03 -07:00
Thomas S Hatch
d8a7eab8e0 clean up first person speak 2014-02-17 14:52:38 -07:00
Thomas S Hatch
547b8e897b Merge pull request #10479 from leonardinius/develop 
saltstack/salt#9851 salt-ssh fileserver operations support warning
 2014-02-17 14:50:23 -07:00
Thomas S Hatch
627d8a4247 Merge pull request #10478 from bechtoldt/fix/debian_ip_bugs 
fixing bond and bridge config templating in debian_ip module
 2014-02-17 14:49:11 -07:00
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
Pedro Algarvio
c0271f0f34 Remove extra line 2014-02-17 21:01:43 +00:00
Pedro Algarvio
41e44a6482 Allow passing a timeout to saltutil.cmd 2014-02-17 19:15:25 +00:00
Pedro Algarvio
fd823c65c5 Pass defined ret to saltutil.cmd before overriding it. 2014-02-17 19:13:18 +00:00
Pedro Algarvio
93caea7cb6 Don't override warnings, append to them. 2014-02-17 19:12:23 +00:00
Pedro Algarvio
2ac21e9302 Drop **kwargs support on salt.states.saltmod.function. 2014-02-17 19:12:19 +00:00
Pedro Algarvio
af782feede Drop **kwargs support on salt.states.saltmod.state. 
Support both `tgt_type` and `expr_form` as keyword arguments while
preferring `tgt_type` and warning the user if both are used.
 2014-02-17 19:10:56 +00:00
Pedro Algarvio
fbbcc2d45c Pass state.function arg keyword along to saltutil.run. 2014-02-17 17:48:49 +00: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
Tomas Kral
7c4c543fdd doc: fix references in salt.modules.pkg 2014-02-17 13:54:42 +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
cfd89f4b84 Update to latest bootstrap script. v2014.02.16 2014-02-16 23:18:12 +00: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