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
69,773 Commits 24 Branches 182 Tags 341 MiB
0d7af935e5
Commit Graph

69773 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
81c935f210 Merge pull request #36754 from terminalmage/issue36738 
Base rpmdev-vercmp comparison result on retcode
 2016-10-05 21:50:23 +09:00
Mike Place
3e6b16de2b Merge pull request #36786 from cachedout/fixup_36676 
Fixup alterernatives module
 2016-10-05 21:49:49 +09:00
Maxime Guillet
21f2a17a07 Fix postgresql tests by adding --no-psqlrc option introduced by #36787. 2016-10-05 14:43:02 +02:00
Mike Place
4bdb997dae Merge pull request #36785 from cachedout/pr-36728 
Fixup merge forward #36728
 2016-10-05 20:02:16 +09:00
Mike Place
3c93134e57
Typo 2016-10-05 19:51:21 +09:00
Maxime Guillet
574e30e915 Fix behavior of psql -c option with postgresql 9.6 
psql -c option no longer implies --no-psqlrc with postgresql 9.6, it must be set explicitly.

Fixes #36787.
 2016-10-05 12:19:54 +02:00
Mike Place
13eb463bd9
Fixup alterernatives module 
This was including the newline which was causing the state modifications present in #36676 to fail in alternatives integration tests which were introduced in 2016.3
 2016-10-05 18:28:21 +09:00
Mike Place
118ba8a772
Update alternatives module to strip newline chars 
Refs an error exposed by #36676
 2016-10-05 18:24:09 +09:00
Mike Place
c126f2e132 Merge pull request #36757 from cachedout/issue_33841 
Resolve issue with minion failing to restart on failure
 2016-10-05 16:02:58 +09:00
Mike Place
90cca6b135 Merge pull request #36768 from gtmanfred/2016.3 
add __utils__ to vultr cloud provider
 2016-10-05 15:59:27 +09:00
Erik Johnson
0e7c600e02 Only display Ctrl-c message on SIGINT 2016-10-04 14:22:28 -05:00
Daniel Wallace
9df2fd11dd add __utils__ to vultr cloud provider 2016-10-04 12:26:36 -05:00
Erik Johnson
d916c2b49c Handle cases where retcode/output feature is backported 
This will handle the case of RHEL 7.3, which maintains an older version
of systemd with the retcode/output changes from "systemctl status" in
systemd 231 backported.
 2016-10-04 09:55:56 -05:00
Mike Place
8ff69bf0c7 Merge pull request #36764 from cachedout/more_pip_test_fixing 
Another bit of detection for failed pip tests
 2016-10-04 22:05:29 +09:00
Mike Place
b9f5343449
Another bit of detection for failed pip tests 
Don't bail out if the download failed for some reason on the remote end
 2016-10-04 21:09:47 +09:00
Mike Place
5c0cbfc4c6 Merge pull request #36747 from jfindlay/arch_test 
modules.archive integration tests: check for gzip, rar
 2016-10-04 20:47:32 +09:00
Mike Place
4bce452500
Resolve issue with minion failing to restart on failure 
Refs #33841
 2016-10-04 13:37:07 +09:00
Mike Place
89f9fc8c0d Merge pull request #36749 from jacobhammons/file-dict 
Fixes the file_dict cli examples to reference the correct function
 2016-10-04 13:07:13 +09:00
Erik Johnson
b3364646ad Update systemd module unit tests 
The _systemctl_status() function has changed its return data, this
commit updates the affected tests to reflect this.
 2016-10-03 22:51:43 -05:00
Erik Johnson
a2439acbc9 systemd.py: check retcode for service availability in systemd >= 231 
systemd 231 changed the output for "systemctl status" for unrecognized
services. This causes Salt to fail to be able to determine if the
service could be found, resulting in an exception being raised.

systemd 231 also made a change to the retcode of "systemctl status" to
distinguish unrecognized services from ones which simply are not
running.

This commit does a systemd version check, and for versions >= 231 checks
the retcode to determine whether or not a given service is available.
 2016-10-03 22:39:04 -05:00
Erik Johnson
928c99d2f7 Base rpmdev-vercmp comparison result on retcode 
This should be a more future-proof way of using this tool for version
comparison.
 2016-10-03 20:23:59 -05:00
Erik Johnson
9025be48c5 Include the jid (when available) in SystemExit message on Ctrl-c 2016-10-03 18:17:08 -05:00
Erik Johnson
9c9f1f620b Add the CLI client and pub_data as class attributes 
This is necessary to filter up the jid to salt.scripts in order to
provide the JID in the SystemExit triggered by the handler added in
6569267.
 2016-10-03 18:15:43 -05:00
Jacob Hammons
71f91b3a50 Fixes the cli examples to reference the correct function 2016-10-03 15:52:54 -06:00
Justin Findlay
b5fcca9983 modules.archive int tests: check for gzip, rar 
Similar to 8733586.
 2016-10-03 11:14:05 -06:00
Mike Place
93f1daa4ce Merge pull request #36744 from cachedout/fix_test_shutdown 
Fix issue where test suite could hang on shutdown
 2016-10-04 00:37:00 +09:00
Mike Place
cdf2a56564
Fix issue where test suite could hang on shutdown 
This is most common in the develop branch but could occur here as well.
 2016-10-03 23:37:05 +09:00
Mike Place
6fa9ec36d2 Merge pull request #36696 from cro/proxy_in_sls_id 
pass __proxy__ in state.sls_id
 2016-10-01 18:37:50 +09:00
Mike Place
e0b288feb3 Merge pull request #36716 from vutny/fix-ini-manage 
salt.modules.ini_manage: fix creating options in empty file
 2016-10-01 18:35:11 +09:00
Mike Place
97713b09f5 Merge pull request #36724 from rallytime/bp-36628 
Back-port #36628 to 2016.3
 2016-10-01 18:33:43 +09:00
Mike Place
8e7529764b Merge pull request #36725 from rallytime/bp-36643 
Back-port #36643 to 2016.3
 2016-10-01 18:33:13 +09:00
Mike Place
cf32c59b6a Merge pull request #36726 from rallytime/bp-36722 
Back-port #36722 to 2016.3
 2016-10-01 18:32:53 +09:00
Mike Place
804a2a1ab0 Merge pull request #36730 from rallytime/bp-36028 
Back-port #36028 to 2015.8
 2016-10-01 18:32:32 +09:00
rallytime
4be4f900ee Back-port #36028 to 2015.8 
The original PR wouldn't back-port cleanly so I made the changes
in #36028 by hand.
 2016-09-30 16:40:56 -06:00
rallytime
24b8bba145 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-09-30 16:13:08 -06:00
rallytime
5904cc04c6 Skip cmd_unzip test if salt.utils.which('zip') isn't available 
This test relies on running archive.cmd_zip in order to have something
to test running archive.cmd_unzip against. Some distros will have the
unzip binary available, but not the zip binary. We need to protect this
test against both so we don't have a false failure on trying to run
archive.cmd_zip.
 2016-09-30 16:02:42 -06:00
James Loosli
c5b8e442f9 a small, and unfortunate error 2016-09-30 16:01:38 -06:00
Yoram Hekma
3bb2cb6379 Update doc to reflect the version where 'none' was added as a pillar_source_merging_strategy 2016-09-30 15:59:21 -06:00
C. R. Oldham
891004f3be try/except for when __proxy__ is not injected. 2016-09-30 14:13:34 -06:00
Megan Wilhite
48d2b01e6c fix python26 archive zip module (#36719) 2016-09-30 13:14:01 -06:00
Denys Havrysh
73eb773fb0 salt.modules.ini_manage: fix creating options in empty file 2016-09-30 18:14:19 +03:00
Mike Place
7d022a3f39 Merge pull request #36699 from cachedout/fixup_36616 
Fix error in test
 2016-09-30 20:28:18 +09:00
Mike Place
16f5bb70ec
Remove line that checks against unordered keys 2016-09-30 20:24:49 +09:00
Mike Place
0aa35596c0 Merge pull request #36670 from jackywu/2016.3 
fix bug for including loopback addr
 2016-09-30 19:21:53 +09:00
Mike Place
a01a68d4be Merge pull request #36676 from vutny/redhat-alternatives-detect-fail 
`alternatives.install` state: detect `alternatives` command failed
 2016-09-30 19:15:45 +09:00
Mike Place
0e8c9abe8d Merge pull request #36694 from lorengordon/issue-36692 
Exposes `ignore_if_missing` to file.replace state module
 2016-09-30 19:12:26 +09:00
Mike Place
eab4fd563a Merge pull request #36700 from terminalmage/update-faq 
Update FAQ to use onchanges in minion restart example
 2016-09-30 19:08:30 +09:00
Erik Johnson
3d15eedfe0 Add additional information about onchanges/onchanges_in 2016-09-29 23:02:39 -05:00
Erik Johnson
57ecbe6c53 Update minion restart example to use onchanges instead of cmd.wait 2016-09-29 23:02:10 -05:00
Mike Place
0e9148293a
Fix error in test 
Introduced in #36616

cc: @cro
 2016-09-30 11:38:03 +09:00