valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
35,860 Commits 24 Branches 182 Tags 341 MiB
ffed07cb8a
Commit Graph

339 Commits

Author SHA1 Message Date
Thomas S Hatch
8518ff10d6 remove hashlib imports since we moved to the utils function 2014-10-02 14:24:12 -06:00
Tarjei Husøy (via Travis CI)
82d7a5d4e7 Use salt.utils.get_hash for hashing 
Prevents memory errors for large files since get_hash uses chunked
hashing.
 2014-10-02 10:21:30 -06: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
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 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
5a57b69a55 Add master_opts to the fileserver object allowing clean pass-through 2014-09-19 19:41:52 -06:00
Thomas S Hatch
1aad3b33d4 get pathing working for the new FSCclient interface 2014-09-19 13:08:47 -06:00
Thomas S Hatch
8b543da706 Catch type error as well 2014-09-19 13:03:17 -06:00
Thomas S Hatch
fe4537f58c init the FS backend 2014-09-19 11:56:33 -06:00
Thomas S Hatch
12ac5b9c5b Add initial FSChan object 
This object will allow us to replace a channel in the file client
with a local channel that just uses the file server class
 2014-09-19 11:54:59 -06:00
Warren Turkal
0966dd2766 Make s3fs work better. 
S3 uses https ETag headers. In some cases (non-multipart uploaded
files), the ETag header is the md5sum of the file. In other cases
(multipart uploaded files) the Etag does not correspond to anything
calculable locally. In that case, files used for the salt filesystem
backend would be downloaded every time the s3 cache timeout expires (a
static 30 seconds). Fortunately, non-md5sum ETags have a hyphen in them.
This patch applies the following logic to such files. If the cached
file is the same size in bytes and has a later last modification time,
it will be considered up to date and will not be downloaded. Otherwise,
it will be updated.

(cherry picked from commit 858e5f9c1d)
Signed-off-by: Warren Turkal <wt@signalfuse.com>

Conflicts:
	salt/fileserver/s3fs.py
 2014-09-11 12:03:58 -07:00
Erik Johnson
a198124249 Remove obsoleted variable PYGIT2_TRANSPORTS 2014-08-21 00:17:28 -05:00
Erik Johnson
47d1c898fd Actually, pygit2 supports auth in 0.20.3 as well 
Allow for a minimum version of 0.20.3. The one difference found so far
is that pygit2.Remote.fetch() returns a class instance starting in
0.21.0, so this commit also changes the logic that checks for the number
of received objects so that it works irrespective of version.
 2014-08-20 23:51:39 -05:00
Erik Johnson
0d3ee9101c Add pygit2 auth to gitfs 2014-08-20 21:36:44 -05:00
Pedro Algarvio
727718e90d Use exc_info_on_loglevel instead of exc_info 2014-08-10 04:00:40 +01:00
Pedro Algarvio
5d3366ebed Use exc_info_on_loglevel instead of exc_info 2014-08-10 04:00:38 +01:00
Erik Johnson
3cd20286e7 Revert "prevent gitfs.py changing load variable that is used by other fs modules too" 
This reverts commit 852571056e. See
https://github.com/saltstack/salt/pull/14594#issuecomment-50952929 for
more info.
 2014-08-01 22:49:34 -05:00
Egor Potiomkin
852571056e prevent gitfs.py changing load variable that is used by other fs modules too 2014-07-29 10:35:42 -05:00
Mathieu Le Marec - Pasquet
58bf9f5d1a Fix critical filelist infinite loop race 2014-07-19 00:14:18 +02:00
rallytime
e748efe13a Changed versionadded for client, fileserver, netapi, and pillar files 2014-07-15 18:26:04 -06:00
Khris Richardson
1acd82f3f1 add sphinx spelling extension. enforce en_us 2014-07-13 13:43:33 -05:00
rallytime
6caff78b18 Remove random :'s 2014-07-01 15:11:51 -06:00
rallytime
f0d9db2497 Removed the term "Hydrogen" from versionadded notation 2014-07-01 15:01:12 -06:00
Erik Johnson
488e906a87 Change loglevel to warning 2014-06-30 13:23:45 -05:00
Erik Johnson
3b478fafaa Make log entry more descriptive 2014-06-30 13:15:11 -05:00
Mathieu Le Marec - Pasquet
34bb4867c3 Skip invalid fileserver cache entries 
This fixes #13836
 2014-06-30 13:45:38 +02:00
Mike Place
c4f5298d62 Create gitfs cache dir if does not exist 
Should fix test suite
 2014-06-17 12:04:53 -06:00
Pedro Algarvio
9dd685cbd7 Log on missing required keys in the load 2014-06-15 13:20:06 +01:00
Erik Johnson
82a5e35a84 Properly handle branches/tags with slashes in name 2014-06-13 17:29:25 -05:00
Erik Johnson
f096a8f5bc Fix single-character variable names 2014-06-13 17:28:53 -05:00
Pedro Algarvio
b908dfb4c9 Fix PEP8 E713 - test for membership should be "not in" 2014-06-06 10:22:26 +01:00
Pedro Algarvio
f329af40d1 Fix PEP8 E713 - test for membership should be "not in" 2014-06-06 10:21:56 +01:00
Pedro Algarvio
ab7bc1d696 Fix PEP8 E713 - test for membership should be "not in" 2014-06-06 10:21:33 +01:00
Pedro Algarvio
5087fbadd8 Fix PEP8 E713 - test for membership should be "not in" 2014-06-06 10:20:54 +01:00
Erik Johnson
9dd8a51a8b Strip trailing path separators from gitfs_root 2014-06-05 11:48:41 -05:00
Erik Johnson
ed65fac906 Add link to new section on how to install GitPython 2014-06-03 10:41:06 -05:00
Seth House
ea7abf0b24 Added cross-link to the minionfs tutorial 2014-05-29 19:26:17 -06:00
Seth House
0cd1ba8ad1 Added links to more minionfs settings 2014-05-22 14:23:35 -06:00
Justin Slattery
6e6303637a Adding verify_ssl flag to S3 filesystem 2014-04-30 10:58:58 -04:00
Thomas S Hatch
3384d1b54a Revert "Fix filelisting infinite loops" 
This reverts commit ef8043bf0b.
 2014-04-14 17:18:20 -06:00
Thomas S Hatch
244f4fddbf Merge pull request #11887 from makinacorpus/fl 
Fix filelisting infinite loops
 2014-04-14 13:40:53 -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
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
Pedro Algarvio
601c4c7746 Merge pull request #11858 from terminalmage/hgfs-env-whitelist 
Add saltenv whitelist/blacklist to hgfs
 2014-04-10 13:09:56 +01:00
Mathieu Le Marec - Pasquet
ef8043bf0b Fix filelisting infinite loops 
Related to #11804 but not sure it fixes it entirely
 2014-04-09 22:57:49 +02:00
Thomas S Hatch
864e9c4570 lint 2014-04-08 15:44:47 -06:00
Thomas S Hatch
287a819f8e Merge pull request #11819 from cachedout/more_md5 
Remove hard-coded MD5 wherever possible.
 2014-04-08 15:38:23 -06:00