valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
33,716 Commits 24 Branches 182 Tags 341 MiB
23abbb99b3
Commit Graph

33716 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas S Hatch
23abbb99b3 Merge pull request #14032 from ihrwein/add-partial-psutil-2.0-compatibility-to-ps-module 
ps: add partial psutil 2.0 compatibility
 2014-07-09 12:39:35 -06:00
Thomas S Hatch
25e7b8f218 Merge pull request #14060 from jacksontj/develop 
Update to the salt @ scale doc
 2014-07-09 12:36:36 -06:00
Thomas Jackson
71f97b9ee7 Update to the salt @ scale doc 2014-07-09 11:06:24 -07:00
btibi
9eeed00382 ps: add partial psutil 2.0 compatibility 2014-07-09 19:54:25 +02:00
Thomas S Hatch
a9f77bbf93 Pop from the rxmsgs queue 2014-07-09 11:32:55 -06:00
Thomas S Hatch
b259fe3f12 lint 2014-07-09 11:23:46 -06:00
Thomas S Hatch
a852b87ff9 Merge pull request #14054 from pass-by-value/raet_test_full_returns_test 
Make sure test_full_returns passes for RAET
 2014-07-09 11:18:21 -06:00
Samuel Smith
3cf0452dff Merge pull request #14057 from SmithSamuelM/sam_raet_50 
LaneStack rxMsgs queue now returns duple (msg, sender)
 2014-07-09 11:01:08 -06:00
Samuel M Smith
033be9e75b Change rnmid to sender 
little more descriptive
made consistent with other changes
 2014-07-09 10:59:19 -06:00
Samuel M Smith
66d769e0c0 Merge remote-tracking branch 'upstream/develop' into sam_raet_50 2014-07-09 10:56:15 -06:00
Samuel M Smith
dd43607926 Change LaneStack rxMsgs to duple (msg, sender) 
where msg is message body dict and
sender is name of remote that sent the message
 2014-07-09 10:54:26 -06:00
Joseph Hall
05deb0847b Merge pull request #14056 from gtmanfred/develop 
glusterfs.list_volumes should return the expected type
 2014-07-09 10:10:37 -06:00
Daniel Wallace
8e1427df62 glusterfs.list_volumes should return the expected type 
We are expecting a list, not a None.

     Comment: An exception occurred in this state: Traceback (most recent call last):
                File "/usr/lib/python2.7/dist-packages/salt/state.py", line 1517, in call
                  **cdata['kwargs'])
                File "/usr/lib/python2.7/dist-packages/salt/states/glusterfs.py", line 178, in started
                  if name not in volumes:
              TypeError: argument of type 'NoneType' is not iterable
 2014-07-09 11:05:52 -05:00
Aditya Kulkarni
b9571b61c7 Make sure test_full_returns passes for RAET 2014-07-09 09:32:50 -06:00
Colton Myers
0d4e78a2c0 Merge pull request #14053 from basepi/2014.1.6release2 
Add master_tops and ext_nodes to release notes for 2014.1.6
 2014-07-09 09:31:01 -06:00
Colton Myers
fefa665252 Add master_tops and ext_nodes to release notes for 2014.1.6 2014-07-09 09:30:35 -06:00
Thomas S Hatch
cfd92d091b Use the new exposure of the authenticated remote estate from raet 
to allow for the minion id to be validated, no spoofing!
 2014-07-08 23:11:34 -06:00
Thomas S Hatch
fd1cc2a86d Correctly pass in the worker_verify str 2014-07-08 22:15:27 -06:00
Thomas S Hatch
2e27304b71 Add worker verify routine to ensure that only workers can send 
verified pub routines to minions
 2014-07-08 22:04:11 -06:00
Thomas S Hatch
8fdddd150b Add a rand string util function 2014-07-08 21:46:27 -06:00
Samuel Smith
1032ba58f7 Merge pull request #14042 from SmithSamuelM/sam_raet_50 
clean up behavior now cleans up stale uxd socket files
 2014-07-08 20:52:15 -06:00
Samuel M Smith
3702936563 Merge remote-tracking branch 'upstream/develop' into sam_raet_50 2014-07-08 20:50:25 -06:00
Samuel M Smith
d2c9795ada Refactored cleanup behavior so now it cleans up stale uxd socket files 2014-07-08 20:49:26 -06:00
Samuel Smith
38eeebb596 Merge pull request #14041 from SmithSamuelM/sam_raet_50 
Salt Raet with support for new raet v0.2.00 with ephemeral Lane Yards
 2014-07-08 20:14:11 -06:00
Samuel M Smith
7fa60cee9a Merge remote-tracking branch 'upstream/develop' into sam_raet_50 2014-07-08 20:12:19 -06:00
Samuel M Smith
66a349e64d Consistent worker yard names 2014-07-08 20:11:03 -06:00
Thomas S Hatch
946d54ebe4 Merge pull request #14037 from rallytime/schedule_tests 
Fix KeyError in schedule.delete and more schedule unit tests
 2014-07-08 20:09:37 -06:00
Thomas S Hatch
37a14bf37c Merge pull request #14039 from terminalmage/fix-gitfs-tests 
Fix gitfs tests
 2014-07-08 20:05:01 -06:00
Erik Johnson
d942c98ef6 Fix gitfs tests 
This changes how the setUp function initializes and commits the repo
used as a gitfs remote by these tests. Instead of using the git.Git
class, it simply uses the index object to add and then commit. See here
for more info:

https://pythonhosted.org/GitPython/0.3.1/tutorial.html#the-index-object

Additionally, file_hash() and serve_file() are designed to check copies
of files that have been retrieved from the blobs, in
$cachedir/gitfs/refs/$saltenv/path/to/file. The paths have been fixed in
these two tests, and the sha1 test has been renamed to ensure that it is
executed after test_find_file, so that the file exists in the cache.
 2014-07-08 18:56:12 -06:00
Pedro Algarvio
ebfb47b2da Merge pull request #14038 from pass-by-value/skip_tests_if_no_network 
Skip tests if no internet connection
 2014-07-09 00:35:54 +01:00
Aditya Kulkarni
edfabad5e2 Skip tests if no internet connection 2014-07-08 17:16:47 -06:00
rallytime
7942350a65 Fix where=None bug 2014-07-08 16:58:19 -06:00
Thomas S Hatch
26d039d513 fix git pillar tests 2014-07-08 16:48:26 -06:00
Thomas S Hatch
f22d5e519c lint 2014-07-08 16:15:00 -06:00
Thomas S Hatch
fee4aa7c15 Merge pull request #14035 from cachedout/12655 
Don't use generic timeout, instead check for returned minions.
 2014-07-08 16:13:43 -06:00
rallytime
562a7e51e2 Reformat changes to schedule.reload 2014-07-08 15:57:26 -06:00
rallytime
0a7b58652b Fix potential KeyError in schedule.delete and more unit tests 2014-07-08 15:54:30 -06:00
Thomas S Hatch
4f293ef11f Make the roster loader top class accept explicit backends 2014-07-08 15:39:09 -06:00
Erik Johnson
ffa9a49ed9 Merge pull request #14031 from techhat/cloud 
Allow multiple instances to be spun up at once
 2014-07-08 15:36:32 -06:00
Samuel M Smith
9cae846b68 updated 2014-07-08 15:18:46 -06:00
Samuel M Smith
995813d535 Merge branch 'sam_raet_50' into ephemeral 
Conflicts:
	salt/daemons/flo/core.py
 2014-07-08 15:17:09 -06:00
Mike Place
62e9faa6b8 Refine publish.publish timeout 2014-07-08 14:52:48 -06:00
Joseph Hall
0c39b84e70 Fix function call check 2014-07-08 14:51:28 -06:00
Samuel Smith
46d01b11f8 Merge pull request #14034 from SmithSamuelM/sam_raet_50 
Added support for raet UDP RoadStack rxMsgs Queue format change
 2014-07-08 14:24:35 -06:00
Samuel M Smith
7bddcddf63 Merge remote-tracking branch 'upstream/develop' into sam_raet_50 2014-07-08 14:20:40 -06:00
Samuel M Smith
e33ac7362b Added support for duple on rxMsgs queue for UDP stack 2014-07-08 14:19:49 -06:00
Thomas S Hatch
b7a6200708 Merge pull request #14027 from pass-by-value/ext_pillar_12647 
Make sure multiple git pillar sources work
 2014-07-08 13:41:38 -06:00
Samuel M Smith
034ba7639d changed to ephemeral yard raet 2014-07-08 12:37:44 -06:00
Thomas S Hatch
ba90c0b22e Merge pull request #14030 from rallytime/schedule_tests 
More scheduler unit tests and fixed keyerror possibility
 2014-07-08 12:27:23 -06:00
Thomas S Hatch
72986ffb59 Merge pull request #14029 from cachedout/7031 
Catch exception in portage_config
 2014-07-08 12:26:51 -06:00