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
37,678 Commits 24 Branches 182 Tags 341 MiB
2e44c0e63e
Commit Graph

37678 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas S Hatch
2e44c0e63e Merge pull request #16288 from feth/develop 
couchdb returner: Document a likely configuration.
 2014-10-01 14:21:14 -06:00
Thomas S Hatch
3abfd22e68 Merge pull request #16286 from garethgreenaway/15650_device_in_unmount 
Changes to mount.py module & state.
 2014-10-01 14:15:11 -06:00
Thomas S Hatch
5cbb5027fb Merge pull request #16297 from thatch45/hulu-pylint 
Merge #16280
 2014-10-01 13:44:20 -06:00
Thomas S Hatch
6292de8ce0 Merge branch 'pylint' of https://github.com/hulu/salt into hulu-pylint 
Conflicts:
	salt/client/raet/__init__.py
	salt/daemons/flo/worker.py
 2014-10-01 13:43:14 -06:00
Colton Myers
e524b429e5 Merge pull request #16290 from rallytime/merge_forward 
Merge 2014.7 forward to develop
 2014-10-01 12:09:24 -06:00
rallytime
8e55094ecd Merge branch '2014.7' into develop 
Conflicts:
	salt/modules/influx.py
 2014-10-01 10:12:06 -06:00
Nicole Thomas
f6cce07ebd Merge pull request #16287 from rallytime/fix_pylint 
Fix pylint on 2014.7 again
 2014-10-01 09:48:16 -06:00
rallytime
af9f440718 Fix a few pylints that I missed the first time 2014-10-01 09:05:23 -06:00
Feth AREZKI
a5bf2a408b couchdb returner: Document a likely configuration. 
It is surprising to the newbie that only the first minion gets to write its data
in the couchdb database.

This documents a workaround that I hope is as clean as possible: create one db
per minion (for instance with the minion id in it).

Ref issue: #16265
 2014-10-01 01:00:11 +02:00
rallytime
d478feacf8 Fix pylint on 2014.7 again 2014-09-30 16:48:34 -06:00
Thomas S Hatch
acbf910d99 Merge pull request #16279 from thatch45/msgpack_gates 
Fix for #16088
 2014-09-30 16:25:21 -06:00
Thomas S Hatch
37267f76b9 Merge pull request #16276 from jacksontj/2014.7 
Ensure that timeout will happen for jobs that don't target any alive minions
 2014-09-30 16:24:19 -06:00
Gareth J. Greenaway
1628f0d936 Allowing passing of device name to the unmount related functions. Per #15650 2014-09-30 15:04:35 -07:00
Thomas S Hatch
b9c33060a5 Merge pull request #16269 from bbinet/influxdb-admin-user 
Influxdb admin user
 2014-09-30 14:33:16 -06:00
Thomas S Hatch
dd66b9c855 lint 2014-09-30 14:29:30 -06:00
Nicole Thomas
d1a32a28c1 Merge pull request #16281 from techhat/cloudreactor 
Add tutorial on using Salt Cloud with the Event Reactor
 2014-09-30 14:16:19 -06:00
Nicole Thomas
de50067a91 Merge pull request #16272 from rallytime/bp-16252 
Backport #16252 to 2014.7
 2014-09-30 14:15:30 -06:00
Thomas S Hatch
52f59de09b Merge pull request #16278 from rallytime/pylinting 
Fix pylint on 2014.7
 2014-09-30 13:57:10 -06:00
Joseph Hall
4aadff6d2b Add Reactor tutorial to index 2014-09-30 12:57:48 -06:00
Joseph Hall
dc88103cdf Add tutorial on using Salt Cloud with the Event Reactor 2014-09-30 12:50:47 -06:00
Chris Rebert
c4f8b78bf6 fix pylint issues in Flo & RAET 2014-09-30 11:31:39 -07:00
Thomas S Hatch
48d89821b3 Merge pull request #16264 from feth/really_copy_dict 
Really copy dict, not only the ref to the dict.
 2014-09-30 12:23:55 -06:00
rallytime
dca4ce75a8 Fix pylint on 2014.7 2014-09-30 12:00:17 -06:00
Thomas S Hatch
395e909d07 Fix for #16088 2014-09-30 11:59:27 -06:00
Thomas S Hatch
1cfd7f7d66 Merge branch '2014.7' into develop 
Conflicts:
	salt/netapi/rest_tornado/saltnado.py
 2014-09-30 11:40:15 -06:00
Thomas Jackson
d9fdc06742 Ensure that timeout will happen for jobs that don't target any alive minions 
Instead of checking if all returns are in, we should check that the job is not running anywhere then enforce the per-minion timeout. I've added a test case for the instance where there is a job fired to a minion that will never return (before it would stall forever)
 2014-09-30 10:11:55 -07:00
Samuel Smith
bb8c96d374 Merge pull request #16273 from SmithSamuelM/2014.7_sam5 
More clean up of yard naming vis a vis application kind
 2014-09-30 11:03:23 -06:00
Samuel M Smith
629789cf8f Merge remote-tracking branch 'upstream/2014.7' into 2014.7_sam5 2014-09-30 10:56:09 -06:00
Samuel M Smith
2091565f7c More cleanup for naming of yard stacks and remotes vis a vis application kind 
Also cleanup some uid yid stuff
 2014-09-30 10:54:35 -06:00
Steve Weber
a0c3723c96 removed the slash when using slspath 2014-09-30 10:51:36 -06:00
Steve Weber
ce92865117 added sls underscore path and removed extra slash 
added sls underscore path and removed extra slash.
I removed the extra slash after much thought... its best to keep things consistent.
The gain by adding the slash is small.
 2014-09-30 10:50:32 -06:00
Bruno Binet
e29109a59e user_exists method should be called with full arg list 2014-09-30 16:50:47 +02:00
Bruno Binet
e2b394e4c2 db_exists method should be called with full arg list 2014-09-30 16:50:13 +02:00
Feth AREZKI
8a38c2dbe2 Really copy dict, not only the ref to the dict. 
Code comment says dict is copied, but only ref to dict is copied:

  # Create a copy of the object that we will return.
  r = ret

Here, the local var 'r' is pointing to the exact same dict as the 'ret' argument.

I use <object>.copy() because 'ret' is expected to be a dict-like object, and
dict have a (shallow) copy method.
Shallow copy seems sufficient here because the '_generate_doc' method and
subsequent users of its return only modify 1st level keys.
 2014-09-30 12:29:34 +02:00
Thomas S Hatch
cc2b7edc1f Merge pull request #16259 from thatch45/ssh_fsclient_mods 
Ssh fsclient mods
 2014-09-29 23:02:02 -06:00
Thomas S Hatch
48fd56ce05 Merge pull request #16258 from thatch45/ssh_refactor_fsclient 
Change the fsclient to only be created once
 2014-09-29 23:00:44 -06:00
Thomas S Hatch
21aeecef5e Merge pull request #16242 from jacksontj/2014.7 
fix for #16240
 2014-09-29 22:54:19 -06:00
Thomas S Hatch
54bd8184c9 Use the correct refs to download the files 2014-09-29 22:51:30 -06:00
Thomas S Hatch
3e4221c443 envs is not a load passing function 2014-09-29 22:45:46 -06:00
Thomas S Hatch
742f0a527e Enable fileserver backends for extension module pushes in salt-ssh 2014-09-29 22:18:26 -06:00
Thomas S Hatch
8a01d88815 Change the fsclient to only be created once 
This allows for the fsclient to not have to re-init multiple
times with each salt-ssh call. it also allows for the fsclient to
be available for the complete execution sequence
 2014-09-29 21:06:27 -06:00
Samuel Smith
60770cf406 Merge pull request #16257 from SmithSamuelM/2014.7_sam5 
Updated consistent semantics for SaltEvent get_event factor
 2014-09-29 20:56:38 -06:00
Samuel M Smith
3d9c9869bd fMerge remote-tracking branch 'upstream/2014.7' into 2014.7_sam5 
Conflicts:
	salt/daemons/flo/core.py
	salt/utils/raetevent.py
 2014-09-29 20:54:50 -06:00
Samuel M Smith
30b32ba5d7 Updated consistent semantics for SaltEvent get_event factor 
node is application kind which is provided by opts['__role']
the values of application kind are 'master, 'minion', 'syndic', 'call'
This allows RAETEvent to set up its lanename correctly
on a master the manor lanename is always 'master'
on a minion the manor lanename is derived from the opts['id']
In general opts should be passed to get_event when possible salt_cloud is the exception for now
This means that can never have two masters running on the same host unless all the directories are
made unique such as cachedir and sockdir
but multiple minions can run on the same host
 2014-09-29 20:47:16 -06:00
Thomas S Hatch
3e204c16f3 Merge branch '2014.7' into develop 2014-09-29 20:07:01 -06:00
Thomas S Hatch
8645b750f2 Merge pull request #16256 from rallytime/pylint 
Pylint fix for 2014.7
 2014-09-29 20:05:08 -06:00
Thomas S Hatch
5d895123e0 Merge pull request #16252 from steverweber/slspath 
removed end slash on slspath
 2014-09-29 20:04:40 -06:00
Thomas S Hatch
ea5c8518db Merge pull request #16246 from rallytime/pillar_docs 
Add note on how to set pillar data on the command line to pillar tutorial
 2014-09-29 20:03:47 -06:00
Thomas S Hatch
3ace3e1405 Merge pull request #16241 from s0undt3ch/hotfix/transifex-updates 
Update 'doc/.tx/config' - Build #166
 2014-09-29 20:02:59 -06:00
Thomas S Hatch
80571cf912 Merge pull request #16238 from cachedout/pillar_context 
Make renderers fully aware of pillar context
 2014-09-29 20:01:53 -06:00