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
92,786 Commits 24 Branches 182 Tags 341 MiB
2ecbe9c034
Commit Graph

92786 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gareth J. Greenaway
2ecbe9c034
fixing typo in alias_function call. 2018-06-06 13:52:45 -07:00
Gareth J. Greenaway
4377e0cc08
Some fixes to the set_pause and rm_pause function in the state runner, renaming to in line with the functions in the state module. Including aliases to previous names for back-ward compatibility. Including a soft_kill function to kill running orchestration states. A new test to test soft_kill functionality. 2018-06-06 13:52:45 -07:00
Daniel Wozniak
1ce7d6c38a
Merge pull request #47989 from dwoz/awscloud 
Properly decode password from aws using m2crypto
 2018-06-06 13:44:28 -07:00
Nicole Thomas
76068c83f5
Merge pull request #47976 from terminalmage/salt-jenkins-1000 
Capture and log output of processes that timed out and were killed
 2018-06-06 15:17:08 -04:00
Nicole Thomas
f12a52736e
Merge pull request #47990 from terminalmage/2018.3-docs 
Docs fixes in 2018.3 release branch
 2018-06-06 13:15:16 -04:00
Daniel A. Wozniak
23ab2727be
Fix linter errors 2018-06-06 09:43:04 -07:00
Nicole Thomas
9d56af3cad
Merge pull request #47982 from twangboy/fix_test_win_dns_client 
Fix `unit.modules.test_win_dns_client` tests
 2018-06-06 11:02:10 -04:00
Nicole Thomas
1b4c72345b
Merge pull request #47985 from twangboy/fix_test_reg 
Fix `unit.states.test_reg` test failure
 2018-06-06 10:56:02 -04:00
Erik Johnson
41e5a75027
Add catch_timeout to run_script 
One of the tests depends on forcing a timeout, but since we no longer
include the timeout message in the stdout/stderr return, we needed a way
to return whether or not the script timed out.
 2018-06-06 09:04:09 -05:00
Erik Johnson
f89d2ccd30
Clean up Sphinx warnings 2018-06-06 08:42:21 -05:00
Daniel A. Wozniak
6c8daa2b85
Properly decode password from aws using m2crypto 
Fixes issue #47955
 2018-06-05 22:27:36 -07:00
Erik Johnson
f5fc936865
Add clarifying comment so that we don't break this 2018-06-05 19:20:51 -05:00
Erik Johnson
94849780ac
fix docs build error due to IndexError 
The `zmq` module is mocked in Sphinx, so ZMQ_VERSION_INFO ends up being
an empty tuple. Since `zmq.eventloop` and `tornado` are both mocked,
changing this from an index to a tuple comparison will prevent the
IndexError and the code within the if block will be a no-op.
 2018-06-05 19:12:21 -05:00
twangboy
4ce551811f
Remove the unnecessary to_unicode stuff 2018-06-05 17:49:22 -06:00
twangboy
863ded39fa
Mock reg.cast_vdata 2018-06-05 15:38:28 -06:00
twangboy
2dcdf6788c
Force string to ModuleType 2018-06-05 15:27:12 -06:00
Erik Johnson
551ada8e4d
Capture and log output of processes that timed out and were killed 
Before, tests.support.case.ShellTestCase.run_script would just go
¯\_(ツ)_/¯ and return that it killed the process. But you can still run
`.communicate()` on a process that was terminated, so this commit does
that and uses it to log the output from the killed process.
 2018-06-05 13:33:39 -05:00
Nicole Thomas
84100570f7
Merge pull request #47957 from garethgreenaway/47236_ensure_passphrase_is_a_string 
[2018.8] Ensure x509 passphrase is a string
 2018-06-05 09:27:33 -04:00
Gareth J. Greenaway
99bad3cca6
removing unnecessary change 2018-06-04 16:04:45 -07:00
Gareth J. Greenaway
e22df8473d
Ensuring that when a passphrase is passed in, it is returned as a string from the passphrase callback. 2018-06-04 16:00:54 -07:00
Nicole Thomas
c355da9e0d
Merge pull request #47926 from dmurphy18/backport_pr47808 
Backport of PR 47808 to 2018.3, improved grains support for AIX
 2018-06-04 15:31:23 -04:00
Nicole Thomas
a46e42ab11
Merge pull request #47927 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-06-04 14:55:11 -04:00
rallytime
5baab66f4b
Lint: Whitespace fix 2018-06-04 12:11:24 -04:00
Nicole Thomas
4db1f8c603
Merge pull request #47931 from rallytime/bp-47913 
Back-port #47913 to 2018.3
 2018-06-04 10:39:15 -04:00
Nicole Thomas
d05a6c70d3
Merge pull request #47930 from rallytime/bp-47725 
Back-port #47725 to 2018.3
 2018-06-04 10:38:57 -04:00
Nicole Thomas
484d83014b
Merge pull request #47557 from L4rS6/fix-broken-rabbitmq-list-policies 
fix broken rabbitmq list policies in rabbitmq version 3.7
 2018-06-04 09:25:06 -04:00
Nicole Thomas
866a2fbf5e
Merge pull request #47949 from terminalmage/salt-jenkins-1000 
Continued troubleshooting on salt-jenkins 1000
 2018-06-04 09:17:13 -04:00
L4rS6
6d7ef27557
Merge branch '2018.3' into fix-broken-rabbitmq-list-policies 2018-06-04 10:59:30 +02:00
Lars Wagner
e043ea2833 refactored list_policies code and added more tests 2018-06-04 10:56:12 +02:00
Erik Johnson
9c369c6aa8
Remove temp logging from test 
It's now being logged in run_script itself
 2018-06-04 00:19:30 -05:00
Erik Johnson
af02d5ba7b
Add result logging to run_script, make returns DRY 2018-06-04 00:17:41 -05:00
Erik Johnson
0b85d1273f
Merge pull request #47941 from terminalmage/salt-jenkins-1000 
Update test logging for salt-jenkins
 2018-06-02 21:40:55 -05:00
Erik Johnson
fb66368af9
Update test logging for salt-jenkins 1000 2018-06-02 21:39:17 -05:00
Nicole Thomas
58b5f2b4dd
Merge pull request #47924 from Ch3LL/mac_gitpy 
Catch all exceptions in git import for salt.utils.gitfs
 2018-06-01 17:06:57 -04:00
Rares POP
c51e732f4d
Fixup! beacons/avahi_announce.py finding grains 
This pull resquest broke the avahi_announce
https://github.com/saltstack/salt/pull/45657
because len('grains.') is 7 and not 6 as this
change say.
What happens now is that is looking in
__grains__ for '.{grain_name}' instead of {grain_name}.

Signed-off-by: Rares POP <rares.pop@ni.com>
 2018-06-01 15:50:53 -04:00
Claudius Zingerli
5c666409f3
Spelling fix 2018-06-01 15:48:43 -04:00
Claudius Zingerli
cfe0a5bb42
network_settings: Fix doc using new list/dict syntax 2018-06-01 15:48:38 -04:00
rallytime
7e1d278d19
Update old utils paths to use new utils paths 2018-06-01 15:00:46 -04:00
rallytime
3273bbdab7
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - doc/ref/configuration/master.rst
  - doc/ref/modules/all/index.rst
  - doc/topics/grains/index.rst
  - doc/topics/releases/2016.3.4.rst
  - doc/topics/spm/spm_formula.rst
  - doc/topics/tutorials/cron.rst
  - doc/topics/tutorials/index.rst
  - doc/topics/tutorials/stormpath.rst
  - salt/engines/slack.py
  - salt/log/handlers/fluent_mod.py
  - salt/modules/cyg.py
  - salt/modules/junos.py
  - salt/modules/namecheap_dns.py
  - salt/modules/namecheap_domains.py
  - salt/modules/namecheap_ns.py
  - salt/modules/namecheap_ssl.py
  - salt/modules/namecheap_users.py
  - salt/modules/reg.py
  - salt/modules/tomcat.py
  - salt/modules/vault.py
  - salt/modules/win_file.py
  - salt/modules/zpool.py
  - salt/output/highstate.py
  - salt/renderers/pass.py
  - salt/runners/cache.py
  - salt/states/boto_apigateway.py
  - salt/states/boto_iam.py
  - salt/states/boto_route53.py
  - salt/states/msteams.py
  - salt/states/reg.py
  - salt/states/win_iis.py
  - tests/integration/modules/test_cmdmod.py
  - tests/integration/states/test_user.py
  - tests/support/helpers.py
  - tests/unit/cloud/clouds/test_openstack.py
  - tests/unit/fileserver/test_gitfs.py
  - tests/unit/modules/test_junos.py
  - tests/unit/pillar/test_git.py
  - tests/unit/states/test_win_path.py
  - tests/unit/test_pillar.py
  - tests/unit/utils/test_format_call.py
  - tests/unit/utils/test_utils.py
  - tests/unit/utils/test_warnings.py
 2018-06-01 14:54:12 -04:00
David Murphy
ac15d2093a Backport of PR 47808 to 2018.3, improved grains support for AIX 2018-06-01 11:06:04 -06:00
Ch3LL
75c51ad69b
Catch all exceptions in git import for salt.utils.gitfs 2018-06-01 11:58:27 -04:00
Nicole Thomas
a2b588299b
Merge pull request #47860 from terminalmage/state-writing-docs 
Clean up doc build warnings, add best practices for writing states
 2018-06-01 10:42:54 -04:00
Daniel Wallace
b88ec5258d
Merge pull request #47879 from dwoz/ami_role_fix 
Fix ami role usage warts #47269
 2018-06-01 09:11:55 -05:00
Daniel Wallace
d2f3377b5b
Merge pull request #47877 from dwoz/sleep_audit 
Revert job chunk wait time change
 2018-06-01 09:11:45 -05:00
Daniel Wallace
735e92093e
Merge pull request #47917 from dwoz/winsuite 
Fix windows tests suite breakage
 2018-06-01 06:42:14 -05:00
Daniel A Wozniak
118601ebd6
Fix windows tests suite breakage 2018-05-31 23:17:18 -07:00
Erik Johnson
8cb33d3dec
Quiet the linter 
We need this import to determine whether we have the needed modules to
run the test, even though it is not invoked directly.
 2018-05-31 15:28:25 -05:00
Erik Johnson
af51e16f23
Use more elegant RST syntax 2018-05-31 15:28:25 -05:00
Erik Johnson
91cd57d1e0
Update mocking to reflect changes in service module 2018-05-31 15:28:25 -05:00
Erik Johnson
b9ace5a859
Fix crappy mocking 
This fixes some poorly-conceived mocking that was done because of some
equally dumb imports being done in salt/modules/junos.py (which I fixed
a few commits ago while in the process of cleaning up the docs).
 2018-05-31 15:28:25 -05:00