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
29,178 Commits 24 Branches 182 Tags 341 MiB
0db6e9a3f2
Commit Graph

29178 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Erik Johnson
24887f0722 Don't shadow builtin reload() 2014-04-12 11:20:34 -05:00
Erik Johnson
8552655c54 Merge pull request #11947 from s0undt3ch/hotfix/pip-global-options 
Allow passing `global_options`
 2014-04-12 10:52:58 -05:00
Pedro Algarvio
e1cbf06244 Allow passing global_options 2014-04-12 13:46:00 +01:00
Joseph Hall
3ef2f69114 Merge pull request #11939 from bretep/add-trace-logging-to-ec2-driver 
Add trace output for EC2 API calls.
 2014-04-11 20:04:34 -06:00
Samuel Smith
5a2bfbb616 Merge pull request #11946 from SmithSamuelM/sam_raet_36 
Made many changes to get master and minion to bootup with external raet
 2014-04-11 17:10:24 -06:00
David Boucha
f8ec812422 Merge pull request #11945 from UtahDave/develop 
remove extra space
 2014-04-11 17:07:12 -06:00
David Boucha
46152f09c2 remove extra space 2014-04-11 17:05:58 -06:00
Samuel M Smith
5d2d070962 comment out wing debug 2014-04-11 17:04:35 -06:00
Samuel M Smith
9fe23aa500 Merge remote-tracking branch 'upstream/develop' into sam_raet_36 2014-04-11 17:03:42 -06:00
Samuel M Smith
295997d57f Fixed some issues found while testing 
Master and Minion now startup and join in external raet.
But still some problem with running salt client. Returns get lost.
 2014-04-11 17:01:18 -06:00
Erik Johnson
d2ccd2be1c Merge pull request #11942 from whiteinge/bug-yamlify-arg-with-newline 
Move checking args for newlines from yamlify_arg into parse_input
 2014-04-11 17:57:04 -05:00
Seth House
2c0aa3b122 Move checking args for newlines from yamlify_arg into parse_input 
The key=val was getting split before getting passed to yamlify_arg and
wasn't working.
 2014-04-11 16:44:48 -06:00
Pedro Algarvio
388fdf0d0c Merge pull request #11938 from terminalmage/docs 
Add svnfs to toctree
 2014-04-11 23:41:08 +01:00
Pedro Algarvio
69fdf2f2de Merge pull request #11941 from s0undt3ch/develop 
It's `salt` not `self`. Refs 418bd3e4.
 2014-04-11 23:39:36 +01:00
Pedro Algarvio
965b09a7d5 It's salt not self. Refs 418bd3e4. 2014-04-11 23:35:56 +01:00
Bret Palsson
1c00e6acab Add trace output for EC2 API calls. 
This will help with debugging salt-cloud calls. The status code
only provides limited information. Amazon will post back what
actually happened. This will output the body of the response
in TRACE output.
 2014-04-11 21:18:49 +00:00
Erik Johnson
c351f8b76e Add svnfs to toctree 2014-04-11 16:17:47 -05:00
Seth House
e67ede9369 Merge pull request #11933 from terminalmage/issue11833 
Fix incorrect pkg.installed state docs
 2014-04-11 14:45:22 -06:00
Seth House
bc10b02d21 Mock requests for building the docs 2014-04-11 14:22:12 -06:00
Mike Place
a3429b0ad6 Merge pull request #11937 from whiteinge/doc-state-module-example 
Added a full but simplistic example of writing a state module
 2014-04-11 14:10:24 -06:00
Seth House
640f613364 Added a full but simplistic example of writing a state module 2014-04-11 14:08:53 -06:00
Erik Johnson
0e6dea1f90 Fix incorrect docs in pkg.installed state 
Also remove spurious "names" param from function definition.

Fixes #11833.
 2014-04-11 13:38:02 -05:00
Erik Johnson
98d4e4113d Add requests to list of mocked modules in docs 2014-04-11 13:37:45 -05:00
Pedro Algarvio
bd7438d477 Merge pull request #11927 from terminalmage/svnfs-env-whitelist 
Add env whitelist/blacklist to svnfs
 2014-04-11 19:23:10 +01:00
Philip Douglass
8f09ad6554 Added urllib3 and six to tops for salt-thin.tgz 2014-04-11 14:14:23 -04:00
Mike Place
46ce129d2e Merge pull request #11930 from esemwy/develop 
Fixed statements in omapi module
 2014-04-11 11:54:26 -06:00
Stephen Youndt
89f1fd927a Fixed statements in omapi module 2014-04-11 13:47:54 -04:00
Mike Place
11195cbd2d Fix compound matching with parens. 2014-04-11 11:33:19 -06:00
John Spray
20c35aaf86 Detect AES key changes in _fire_master 
This is a follow up to 8ba9543, which changed the fire_master
implementation to use existing AES key instead of re-authenticating.

That change caused a problem in use cases which send a lot of events
but don't run jobs, because when the AES key changed, the minion
would never notice, and keep sending messages with the old key
indefinitely.

This change adds an attempt to decrypted to response to the sent
event, and to re-authenticated if the response can't be decrypted
in order to handle AES key changes.
 2014-04-11 18:09:04 +01:00
John Spray
df226ea1fa Fix #11919: handling exceptions in scheduled jobs 
Improvements:

 1. Catch exceptions from scheduled jobs and log them.
 2. Only silence OSErrors removing proc file if it's an EEXIST:
 otherwise log it
 3. Put the /var/cache/salt/minion/proc/<jid> deletion in a finally:
 block
 4. Only respect a "running" job as such if its PID really exists
 2014-04-11 17:55:28 +01:00
Erik Johnson
910393fa3c Add new params to master config docs 
Also fixed up some of the wording on the other recently-added remote
fileserver configuration parameters.
 2014-04-11 11:40:01 -05:00
Erik Johnson
4001f747ae Add env whitelist/blacklist to svnfs 
Also simplify how per-repo configuration is handled, as has been done in
gitfs, hgfs, and minionfs.
 2014-04-11 11:40:01 -05:00
Mike Place
551495ff69 Merge pull request #11924 from cachedout/11835 
Pylint
 2014-04-11 10:27:45 -06:00
Erik Johnson
c6446a5f6d Add default values for new parameters 2014-04-11 11:11:54 -05:00
Mike Place
e1fc42eb59 Merge pull request #11920 from s0undt3ch/develop 
Add coding header
 2014-04-11 09:32:42 -06:00
Mike Place
7fe5ddd0fc Pylint 2014-04-11 09:19:08 -06:00
Massimiliano Torromeo
90bece1faa Allow systemd units no provided by unit files to be handled. 
This allows to query status, start, stop, restart and list units that
are not actually provided by unit files. Such units cannot be
enabled/disabled and that's why those actions still prefer the
"list-unit-files" output over "list-units".

Units that couldn't be handled otherwise include for example mount
units and sysvinit compatibility units such as those present on
debian systems.

The output of a "service.running ssh" state on a debian wheezy target
is:

          ID: ssh
    Function: service.running
      Result: False
     Comment: The named service ssh is not available
     Changes:

after this patch:

          ID: ssh
    Function: service.running
      Result: True
     Comment: The service ssh is already running
     Changes:
 2014-04-11 14:43:02 +02:00
Pedro Algarvio
307f4e5b8f Add coding header 2014-04-11 13:16:31 +01:00
Joseph Hall
3e06fb3b83 Merge pull request #11916 from JensRantil/document-mine-compound 
module(mine): document that compount matching works
 2014-04-11 05:49:56 -06:00
Joseph Hall
ca5a1329df Merge pull request #11915 from wyndhblb/develop 
add new "r" big memory series
 2014-04-11 05:48:47 -06:00
Jens Rantil
dd69825846 module(mine): document that compount matching works 
I just tried it on 2014.1.0. This fixes #6041.
 2014-04-11 10:41:50 +02:00
Bo Blanton
c67b05212d add new "r" big memory series 2014-04-10 21:30:49 -07:00
Thomas S Hatch
6ecb174227 Merge pull request #11898 from rallytime/cmdrun_feature 
Onlyif return codes added to debug log
 2014-04-10 18:51:50 -06:00
Pedro Algarvio
e02eff4bb0 Merge pull request #11909 from terminalmage/issue11822 
Fix 32-bit packages of different arches than the CPU arch on 32-bit RHEL/CentOS
 2014-04-11 01:42:45 +01:00
Samuel Smith
510d3b09bc Merge pull request #11913 from SmithSamuelM/sam_raet_35 
Removed references to raet and table from setup.py
 2014-04-10 17:03:05 -06:00
Samuel M Smith
a68daa450f Removed references to raet and table from setup.py 2014-04-10 16:59:56 -06:00
Samuel Smith
4090b7d3fc Merge pull request #11911 from SmithSamuelM/sam_raet_35 
Fixed some more stuff associated with external Raet
 2014-04-10 16:53:28 -06:00
Samuel M Smith
8a69e1a834 Removed master_keys which depends on salt.transport.table which no longer exists 2014-04-10 16:47:13 -06:00
Samuel M Smith
1591613c6f Merge remote-tracking branch 'upstream/develop' into sam_raet_35 2014-04-10 16:43:56 -06:00
Samuel M Smith
894990ee86 Fixed some more porting problems with external raet 2014-04-10 16:42:16 -06:00