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
25,536 Commits 24 Branches 182 Tags 341 MiB
233f08d990
Commit Graph

25536 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Erik Johnson
233f08d990 Fix ports.installed state for pkg names that don't match origin 
This fixes a bug where ports.installed states report failure to install,
due to the package name not matching the name of the port. For example,
if installing www/mod_perl2 for use with www/apache22, this results in a
package name of ap22-mod_perl2. The ports.installed state thinks the
install failed because of this package name mismatch.

This fix checks the origin names of installed packages, instead of the
name of the package itself.
 2014-02-05 23:13:54 -06:00
Erik Johnson
49d9a6aa45 freebsdpkg: add with_origin option to list_pkgs() 
This adds a new option to list_pkgs() which, if True, will return a more
complex data structure containing both the origin and version for each
package.
 2014-02-05 22:45:48 -06:00
Erik Johnson
b151641445 pkgng: add with_origin option to list_pkgs() 
This adds a new option to list_pkgs() which, if True, will return a more
complex data structure containing both the origin and version for each
package.
 2014-02-05 22:45:48 -06:00
Erik Johnson
7cf146f5ea Add versionadded directives for cp.cache_dir 
This adds documentation for new parameters, and also notes when they
were added.
 2014-02-05 20:56:10 -06:00
Thomas S Hatch
e8f82fa36f Merge pull request #10194 from terminalmage/10160 
Sync only *.py, *.pyx, *.so in saltutil.sync_*
 2014-02-05 19:43:32 -07:00
Joseph Hall
74abdb2129 Merge pull request #10226 from levigross/develop 
Removed extra indent to allow the function to return false if an IP is not able to be converted
 2014-02-05 19:30:49 -07:00
Levi Gross
0f58bc9f3d Removed extra indent to allow the function to return false if an IP is not able to be converted 2014-02-05 21:25:56 -05:00
Joseph Hall
fc5418adcc Merge pull request #10225 from levigross/develop 
Removed extra indent to allow the function to return false if an IP is not able to be converted
 2014-02-05 19:06:08 -07:00
Levi Gross
d3d49367e8 Removed extra indent to allow the function to return false if an IP is not able to be converted 
Signed-off-by: Levi Gross <levi@levigross.com>
 2014-02-05 20:46:08 -05:00
Joseph Hall
e9b0d4380d Merge pull request #10222 from gtmanfred/develop 
[salt.cloud] clear salt mine on delete
 2014-02-05 18:15:39 -07:00
Daniel Wallace
57f8256e38 [salt.cloud] clear salt mine on delete 
Set the profile the server was built with in the metadata.  When the
server is deleted, if the flush_mine_on_destroy is set on that profile,
flush the mine of data.
 2014-02-05 19:16:50 -06:00
Thomas S Hatch
5c6e3ba0b3 Learning more ioflo 2014-02-05 17:56:51 -07:00
Pedro Algarvio
5bd6108582 Merge pull request #10217 from s0undt3ch/issues/10198-missed-saltenv 
Provide tests cases for #10197 and #10198
 2014-02-05 23:19:19 +00:00
Pedro Algarvio
5ad50d457e Merge pull request #10216 from plastikos/issue-10215 
Correct grain for test "os" => "os_family": issue-10215
 2014-02-05 22:08:35 +00:00
Pedro Algarvio
66a6c931b1 Merge pull request #10198 from mbarrien/ssh-auth-env-develop 
Fix ssh_auth pulling keyfile from correct env
 2014-02-05 21:59:44 +00:00
Pedro Algarvio
b66418e263 Provide tests cases for #10197 and #10198 2014-02-05 21:56:08 +00:00
Thayne Harbaugh
446599adc5 Correctly grain for test "os" => "os_family": issue-10215 2014-02-05 14:38:45 -07:00
Thomas S Hatch
52841b6e22 Fix issue with bad refactor of table paths 2014-02-05 14:19:52 -07:00
Thomas S Hatch
263dd02a7e Add initial ioflo tracking libs to the ioflo master dir 2014-02-05 14:19:52 -07:00
Thomas S Hatch
4af8ce16d9 Add master_keys function to masterapi 2014-02-05 14:19:52 -07:00
Thomas S Hatch
cea0b785fd clean up no longer used imports 2014-02-05 14:19:52 -07:00
Thomas S Hatch
1cd54d1226 Factor out fileserver updates and clean_old_jobs 2014-02-05 14:19:52 -07:00
Thomas S Hatch
888c63c39e migrate the access_keys routine into the masterapi for generic access 2014-02-05 14:19:52 -07:00
Pedro Algarvio
a61e6d00f5 Merge pull request #10200 from bogdanr/develop 
Add two options in the salt-ssh documentation
 2014-02-05 18:23:16 +00:00
Michael Barrientos
fd2dd26e5b Fix ssh_auth pulling keyfile from correct env 2014-02-05 09:46:22 -08:00
Thomas S Hatch
cd25c03b18 clean out bad return 2014-02-05 10:02:05 -07:00
Thomas S Hatch
1ba822e17f lint fixes 2014-02-05 09:51:17 -07:00
Thomas S Hatch
e0bf4982a3 use .get for os_family lookups 2014-02-05 09:45:55 -07:00
Bogdan Radulescu
ff4342adcb Add two options in the salt-ssh documentation 2014-02-05 16:32:16 +02:00
Thomas S Hatch
3ca6fee030 python2.6 needs indices in format strings per #10192 
@codekoala, just a minor fix :)
 2014-02-04 21:02:28 -07:00
Thomas S Hatch
4c9c3ee0c8 Merge pull request #10192 from codekoala/pickled-carbon 
Carbon returner's pickle protocol
 2014-02-04 20:00:15 -08:00
Thomas S Hatch
ea4bc80549 Merge pull request #10183 from tedski/10107_fix 
Check for missing deps before attempting to install.
 2014-02-04 19:41:51 -08:00
Pedro Algarvio
6d7cd072a1 Merge pull request #10195 from s0undt3ch/develop 
Fix typo
 2014-02-04 18:32:43 -08:00
Pedro Algarvio
c304660f88 Fix typo 2014-02-05 02:32:04 +00:00
Erik Johnson
f9317dd78f Sync only *.py, *.pyx, *.so in saltutil.sync_* 
This avoids caching anything but the file types that are needed by
saltutil.sync_*.
 2014-02-04 19:33:48 -06:00
Erik Johnson
0381e9872b Add include_pat/exclude_pat to cp.cache_dir 
This uses the include_pat/exclude_pat logic from the file.recurse state
to the cp.cache_dir function, allowing one to selectively cache the
desired files.
 2014-02-04 19:33:10 -06:00
Erik Johnson
142260c8c0 Add include_pat/exclude_pat to fileclient.cache_dir 
This uses the include_pat/exclude_pat logic from the file.recurse state
to the fileclient, allowing one to selectively cache the desired files.
 2014-02-04 19:29:45 -06:00
Erik Johnson
c4cac9550f Fix refs to _check_include_exclude() 
Now that this has been moved to salt.utils, fix the refs to point to
this function's new location.
 2014-02-04 19:28:55 -06:00
Erik Johnson
0bb96379db add check_include_exclude() to salt.utils 
This moves this helper function from salt.states.file.
 2014-02-04 19:26:39 -06:00
Josh VanderLinden
36b87868bf Refactoring and fixing the pickle protocol 2014-02-04 17:18:50 -07:00
Thomas S Hatch
a85838b4ff Merge pull request #10188 from nshalman/smartos-cron-fix 
Fix cron state to work on SmartOS
 2014-02-04 16:16:09 -08:00
Thomas S Hatch
6d3e61552f Merge pull request #10191 from cachedout/#8087 
Optimize event timeouts
 2014-02-04 16:14:00 -08:00
Thomas S Hatch
ffcddfdf26 Merge pull request #10186 from terminalmage/docs 
Add info about root_dir and the options to which it is prepended
 2014-02-04 16:13:32 -08:00
Thomas S Hatch
b57ddf67c6 Merge pull request #10185 from s0undt3ch/develop 
Fix lint issues
 2014-02-04 16:11:31 -08:00
Thomas S Hatch
39acd91a73 Merge pull request #10182 from s0undt3ch/hotfix/kill-stalled-state-jobs 
Show and kill stalled states jobs when running the tests.
 2014-02-04 16:09:04 -08:00
Thomas S Hatch
aedcfe0c9f Merge pull request #10180 from terminalmage/yum-edgecase 
Handle yum edge case
 2014-02-04 16:07:13 -08:00
Mike Place
9e2ca7fa57 * Remove spurious comment. 2014-02-04 16:27:39 -07:00
Mike Place
90f0af03d1 Optimize event timeouts 
* Don't use int() to round down timestamps in get_cli_event_returns()
* Don't re-poll for the full timeout if we get an unresponsive minion. Refs #8087
 2014-02-04 16:22:53 -07:00
Thomas S Hatch
2a2b71d399 Merge pull request #10173 from mbirtwell/wait_for_explicit_minions_in_gather_job_info_develop 
Wait for explicit minions in gather job info develop
 2014-02-04 15:20:36 -08:00
Ted Strzalkowski
4d79dc7442 Renamed salt.modules.apt_pkg to salt.modules.aptpkg for continuity with salt.modules.yumpkg 2014-02-04 15:10:25 -08:00