valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
39,057 Commits 24 Branches 182 Tags 341 MiB
0cc0d64136
Commit Graph

39057 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason R. McNeil
08a7359daf Use the image id as name is not unique for DigitalOcean images. 
Conflicts:
	salt/cloud/clouds/digital_ocean_v2.py
 2014-10-24 16:56:00 -06:00
Thomas S Hatch
939191ae6e Merge pull request #16892 from rallytime/cloud_test_update 
Change profile name for Digital Ocean cloud tests
 2014-10-24 16:53:45 -06:00
Thomas S Hatch
a81898f0b1 Fix broken salt ssh extension mods dir 2014-10-24 16:45:45 -06:00
Thomas S Hatch
3c86949667 Merge branch '2014.7-config' of https://github.com/jacksontj/salt into jacksontj-2014.7-config 2014-10-24 16:45:18 -06:00
Thomas S Hatch
2e7fe19ee2 Merge pull request #16891 from rallytime/bp-16809 
Backport #16809 to 2014.7
 2014-10-24 16:39:04 -06:00
rallytime
429c17aef3 Pylint fix 2014-10-24 16:36:24 -06:00
Thomas S Hatch
ce28ee1b89 Merge pull request #16890 from rallytime/bp-16798 
Backport #16798 to 2014.7
 2014-10-24 16:35:09 -06:00
Mike Place
0492e84130 Catch error conditions in quota.get_mode 
Closes #16381
 2014-10-24 16:34:56 -06:00
Thomas S Hatch
e8738638f5 Merge pull request #16886 from techhat/filemap 
Add file_map to salt.utils.cloud.bootstrap-enabled providers
 2014-10-24 16:33:40 -06:00
Tanoti
6858ce751d Fixed invalid archive type error message, was reporting 'name' not 'archive_format' 2014-10-24 16:31:17 -06:00
Henrik Holmboe
0e772aefe7 Update conf.py as well 2014-10-24 16:27:37 -06:00
Henrik Holmboe
1fc008bf25 Point to the correct latest 2014.1.13 release 
This is recurring and #12720 is tracking the issue.

Conflicts:
	doc/topics/releases/index.rst
 2014-10-24 16:27:11 -06:00
rallytime
617d777fa9 Release notes for 2014.1.13 2014-10-24 16:22:53 -06:00
Samuel M Smith
b28d0b3b45 Fixed lint comment 2014-10-24 16:19:53 -06:00
Thomas S Hatch
c12dc911b2 Merge pull request #16841 from isbm/salt-zypper 
Package lock management support for Zypper
 2014-10-24 16:16:20 -06:00
rallytime
f94cf6ad68 Change profile name for Digital Ocean cloud tests 
Digital Ocean changed their image-naming scheme. This should fix the failing tests.
 2014-10-24 16:14:02 -06:00
Thomas S Hatch
0fed446cd4 Merge pull request #16877 from jasonrm/fix/digitalocean-list-images 
Fix salt-cloud list-images for DigitalOcean images
 2014-10-24 16:05:29 -06:00
Thomas S Hatch
d40d675b3e Merge pull request #16812 from syphernl/fix/tomcat_tabstrip 
Strip off tabs for tomcat version calls
 2014-10-24 16:03:23 -06:00
Thomas S Hatch
c6718fc373 Merge pull request #16884 from terminalmage/issue16874 
Install repoquery if not present on yum-based distro
 2014-10-24 16:02:04 -06:00
Thomas S Hatch
ce21d6ea4a Merge pull request #16881 from jacksontj/2014.7 
Fixes for Syndic
 2014-10-24 16:01:23 -06:00
vs
6f85a95ea5 only add mine.update to schedular if function is available 2014-10-24 15:59:42 -06:00
Mike Place
ab0b45cab7 Avoid key error in connected_ids() 
Continue through the loop if we could't access the grains instead of
crashing and burning.

Closes #15143
 2014-10-24 15:55:58 -06:00
Thomas Jackson
3438db0a0e Fix for #16888 
We can't set the default value to something if you want the config to be relative to cachedir.

Since there is already code in apply_minion_config to take care of this we remove this, meaning now that if you set cachedir it won't break these
 2014-10-24 14:49:49 -07:00
Samuel Smith
a2d77c4f87 Merge pull request #16887 from SmithSamuelM/sam_dev1 
Added partial support for Multi-Master in Raet
 2014-10-24 15:43:41 -06:00
Samuel M Smith
acf381e307 Fixed pylint warnings 2014-10-24 15:40:39 -06:00
Samuel M Smith
8ea8881ef2 Merge remote-tracking branch 'upstream/develop' into sam_dev1 2014-10-24 15:31:04 -06:00
rallytime
19d70dfac5 Added another test to module.run state unit tests 2014-10-24 15:28:03 -06:00
Joseph Hall
79c3e1e0dc Add file_map to salt.utils.cloud.bootstrap-enabled providers 2014-10-24 15:24:02 -06:00
Thomas Jackson
bd4c3ba583 Cleanup all other returners to handle the new passed_jid argument 2014-10-24 14:17:58 -07:00
Erik Johnson
d1e867c718 Remove known issue comment for salt-ssh 2014-10-24 16:16:33 -05:00
Erik Johnson
bfc64130d9 Add notice on automatic installation of repoquery 2014-10-24 16:16:27 -05:00
Erik Johnson
706f53941b Add notice on automatic installation of repoquery 2014-10-24 16:15:48 -05:00
Mike Place
76eb34c62c Workflow to display minion exceptions in LocalClient 2014-10-24 15:09:26 -06:00
Erik Johnson
ff851cffb6 Install repoquery if not present on yum-based distro 
Resolves #16874.
 2014-10-24 15:50:31 -05:00
Thomas Jackson
ef9b54672e Fix for #16825 
In the case that you are a lower level master (under a syndic) we weren't calling prep_jid, which meant that the job wasn't initialized in the cache. Now we call prep_jid all the time, optionally with a jid passed in. This way the master can ensure that it is ready to store information about this jid when it goes further down the track (ret, save_load, etc.)
 2014-10-24 13:19:26 -07:00
Thomas Jackson
def11a2128 Fix event forwarding, someone (during refactoring?) had removed registering the event socket to the poller, which meant that the syndic would never forward events 2014-10-24 13:16:26 -07:00
Mike Place
9db48612ae Support job data 2014-10-24 11:37:03 -06:00
Thayne Harbaugh
7bd7e4c2b7 Appease the pylint gods; back-out unrelated changes. 2014-10-24 11:32:12 -06:00
Thayne Harbaugh
65e477dd67 Improve filter_by() base argument: 
* Change filter_by() base argument to a key in lookup_dict rather
    than a dictionary.  This allows more compact usage and more
    readable use of base values/defaults in the lookup_dict.

  * Change/improve function-local documentation for lookup_dict().

  * Add specific use-case of "base" argument for lookup_dict() in the
    formulas documentation.

  * Expand filter_by() unit testing to validate use of base argument.

  * Add unit test for salt.utils.dictupdate.update() to provide
    complete depth-of-testing of filter_by() which uses
    dictupdate.update().
 2014-10-24 11:13:47 -06:00
Mike Place
59d5c47c7d Register error handlers with reactor as callbacks 
This is kind of a wild idea, but here goes.

I modified the reactor system to accept raw functions that act as
callbacks.

This means that we can get rid of loops that check for events and
instead just write functions that can register *theselves* with the
reactor and then have events streamed back to them. This has a lot of
interesting applications, such as facilitating a GUI that, instead of
using an REST API, could simply have a lightweight event-driven API that
registers with the reactor and has updates streamed back to it.

This is a proof of concept of this idea which illustrates minion error
messages being tossed across the event bus and the master registering an
error handler with the reactor to process them.
 2014-10-24 10:55:23 -06:00
Jason R. McNeil
21806091d3 Correctly detect additional pages in DigitalOcean API v2 2014-10-24 09:05:21 -07:00
Jason R. McNeil
88e0fd64f5 Use the image id as name is not unique for DigitalOcean images. 2014-10-24 08:54:40 -07:00
Joseph Hall
79dacabf18 Merge pull request #16875 from rallytime/release_notes 
Added updates to 2014.7.0 release notes
 2014-10-24 09:34:29 -06:00
rallytime
b90ba8cf4e Added updates to 2014.7.0 release notes 2014-10-24 09:29:13 -06:00
rallytime
f6490e9572 Add initial unit tests for module.run state function 2014-10-24 08:56:40 -06:00
Bo Maryniuk
4586d73bc1 Get known package patterns, available in Zypper repos 2014-10-24 15:28:24 +02:00
Frank Klaassen
9da4500e7f fix lstrip 2014-10-24 14:40:29 +02:00
Frank Klaassen
f0829549bf Fix linting 2014-10-24 14:38:55 +02:00
Bo Maryniuk
72724a529f Moved file ownership by a package to the lowpkg module. 2014-10-24 14:00:37 +02:00
Bo Maryniuk
396f4054f9 Added file operations for the package management 2014-10-24 13:43:43 +02:00