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
79,104 Commits 24 Branches 182 Tags 341 MiB
b31d1377ab
Commit Graph

79104 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
626655b720 Merge pull request #39742 from tgoodlet/handle_empty_pw_edge_case 
Handle edge case: password and empty_password both set
 2017-03-01 10:00:11 -07:00
Mike Place
6dfd7fed5b Merge pull request #39745 from pengyao/saltssh_askpass 
Fix #39350
 2017-03-01 09:59:14 -07:00
Mike Place
66a01bea5b Merge pull request #39747 from bodhi-space/infra4445 
INFRA-4445 - sort policy docs so they compare equal when they in fact are
 2017-03-01 09:56:46 -07:00
Ch3LL
1853c998c4 add initial 2016.11.4 release notes 2017-03-01 09:47:07 -07:00
rallytime
6a9fbd314c Remove duplicate test 2017-03-01 09:25:35 -07:00
Luke Hollins
25655278ae Fixed whitespace error 2017-03-01 11:23:25 -05:00
Pedro Algarvio
f377a25394
Update development requirements file 2017-03-01 16:15:10 +00:00
Mike Place
663e55bcd4 Merge pull request #39758 from cachedout/pr-39753 
Fix docs test for #39753
 2017-03-01 09:06:52 -07:00
Mike Place
33e40c94e4
Fix docs test for #39753 2017-03-01 09:06:17 -07:00
Mike Place
1d3a3f4d6b Merge pull request #39753 from skazi0/esxi-credstore 
Added credstore option to esxi proxy config
 2017-03-01 09:06:04 -07:00
Luke Hollins
1bf1d337d5 Merge branch 'develop' into dockerng_sysctl 2017-03-01 10:38:32 -05:00
Zhi Han
1031056f12 Merge pull request #1 from zhihan/zhihan-patch-1 
Handle special cases in exit_success
 2017-03-01 10:11:29 -05:00
Zhi Han
74971d1b05 Handle special cases in exit_success 
Make sure the logic in exit_success is equivalent to that of lookup_jid:
 - Have default values for 'Minions' and 'Result' in the data
 - If a job has return but is not listed in minions, consider it a success.

Handles the case where lookup_jid find the job but does not know the minions:

$ salt-run jobs.lookup_jid
....
StartTime:
    2017, Mar 01 03:50:59.396278
Target:
    unknown-target
Target-type:
User:
    root
jid:
    20170301035059396278

$ salt-run jobs.exit_success
Exception occurred in runner jobs.exit_success: Traceback (most recent call last):
  File "/usr/lib/python2.7/dist-packages/salt/client/mixins.py", line 395, in _low
    data['return'] = self.functions[fun](*args, **kwargs)
  File "/usr/lib/python2.7/dist-packages/salt/runners/jobs.py", line 478, in exit_success
    minions = data['Minions']
KeyError: 'Minions'
 2017-03-01 10:10:59 -05:00
Jacek Tomasiak
e550aeca64 Added credstore option to esxi proxy config 
Credential store can be used to store server thumbprints where untrusted
SSL certs are used. It needs to be passed to esxcli as an additional
argument.

With this change, it's possible to set path to the credential store in
the proxy config pillar.
 2017-03-01 12:40:39 +01:00
Pedro Algarvio
2e555c3c00 Merge pull request #39693 from s0undt3ch/features/pytest-salt-daemons 
Drop the salttesting dependency.
 2017-03-01 08:41:50 +00:00
Kadlec Jan
d5d99d6399 recteate unit tests 2017-03-01 07:13:28 +01:00
Tom Williams
474dc619ba INFRA-4445 - sort policy docs so they compare equal when they in fact are 2017-02-28 23:54:41 -05:00
pengyao
a8ced5a5e1 Fix #39350 
If use "--askpass" option by salt-ssh, ssh_passwd option explicit set to True, to avoid overwrite by MergeConfig
 2017-03-01 10:56:08 +08:00
Tom Williams
aa8d822e78 INFRA-4487 - fix unit test to match corrected return value 2017-02-28 21:01:57 -05:00
Tom Williams
959033e39b INFRA-4487 - 'test=True' should return True rather than None if no changes are scheduled. 2017-02-28 21:01:56 -05:00
Pedro Algarvio
251c4c20ab
Add PyLint checker to make sure salttesting is not being used on develop 2017-03-01 01:33:08 +00:00
Pedro Algarvio
a78c037a5f
PyLint, no its not a repeated keyword! 2017-03-01 01:33:08 +00:00
Pedro Algarvio
4f425e596b
Don't assert, just fail 2017-03-01 01:33:08 +00:00
Pedro Algarvio
bb60e5010c
Redundant 2017-03-01 01:33:08 +00:00
Pedro Algarvio
ab83cced63
Child processes termination cleanup 2017-03-01 01:33:07 +00:00
Pedro Algarvio
40a64191a1
Absolute imports and A LOT of code cleanup. 2017-03-01 01:33:07 +00:00
rallytime
452822f5f7 Merge branch '2016.11' into 'develop' 
No conflicts.
 2017-02-28 17:14:40 -07:00
Tyler Goodlet
fa56515bd3 Handle edge case: password and empty_password both set 
Handle the case where a user mistakenly passes both the
password and empty_password=True arguments. Instead of throwing
as weird key error, simply log a warning message and fail gracefully.

Fixes #39741
 2017-02-28 18:06:15 -05:00
twangboy
037dfb3ece Fix lint error 2017-02-28 15:56:06 -07:00
Pedro Algarvio
3beb3fb801
Move whatever we need from salttesting to salt. 
Let's drop the salttesting dependency cycle.
 2017-02-28 22:52:49 +00:00
Pedro Algarvio
08804932c3
Using pytest start_daemon 2017-02-28 22:52:48 +00:00
Pedro Algarvio
53eff91efa
Re-enable the test since we now have the flaky decorator 2017-02-28 22:52:48 +00:00
Pedro Algarvio
2a9d2beb02
The order is shady under Py3 
/cc @cachedout @rallytime
 2017-02-28 22:52:48 +00:00
Pedro Algarvio
1daa2e24cd
Moved some test supporting modules to tests/support 
Previously they were in tests/utils which also had test case modules.
 2017-02-28 22:52:48 +00:00
Pedro Algarvio
7278a6c868
You need to pass a list. How did this ever pass?! 2017-02-28 22:52:48 +00:00
Mike Place
e6d6de6062 Merge pull request #39714 from alex-zel/patch-1 
Update elasticsearch.py
 2017-02-28 15:15:46 -07:00
Mike Place
13c720ae34 Merge pull request #39719 from Seb-Solon/Fix-#39692 
Support new version of tuned-adm binary
 2017-02-28 15:15:06 -07:00
Mike Place
c961c5ce05 Merge pull request #39738 from bodhi-space/infra4510 
INFRA-4510 - skip trying to add instances in non-running states to ELBs
 2017-02-28 15:12:27 -07:00
Mike Place
ec79d238fb Merge pull request #39732 from gtmanfred/develop 
Add queueing of runner tasks using the scheduler and queue runner
 2017-02-28 15:09:43 -07:00
Mike Place
0147f78ab5 Merge pull request #39731 from twangboy/win_pkg_docs 
Add docs for Kwargs in pkg.refresh_db
 2017-02-28 15:02:58 -07:00
Mike Place
a73a5f9c1f Merge pull request #39646 from terminalmage/zh921 
Handle deprecation of passing string args to load_args_and_kwargs
 2017-02-28 14:59:33 -07:00
Mike Place
2a10e00f7c Merge pull request #39740 from bodhi-space/infra4528 
INFRA-4528 - Docstring updates and logging cleanup for the makostack ext_pillar
 2017-02-28 14:50:48 -07:00
Mike Place
e8ba69f0f9 Merge pull request #39735 from carlpett/feature/vault-enhanced-policy-error-handling 
Vault: Handle patterns with non-existing keys
 2017-02-28 14:49:15 -07:00
Daniel Wallace
39bb623bdc fix pylint 2017-02-28 14:53:02 -06:00
Tom Williams
8649c4c224 INFRA-4528 - Some docstring updates, and one new log.info() call, for makostack module. 2017-02-28 15:52:48 -05:00
Mike Place
fce2d184f3 Merge pull request #39734 from garethgreenaway/39710_missing_schedule_add_parameter 
Missing parameter in the schedule.add function
 2017-02-28 13:43:07 -07:00
Daniel Wallace
878b21662e add test for queue 2017-02-28 14:10:41 -06:00
Calle Pettersson
4154910dd3 Vault: Handle patterns with non-existing keys 2017-02-28 21:07:49 +01:00
Nicole Thomas
8809d33674 Merge pull request #39701 from rallytime/merge-develop 
[develop] Merge forward from 2016.11 to develop
 2017-02-28 12:50:10 -07:00
Gareth J. Greenaway
63eb610245 Per #39710, missing parameter in the schedule.add function 2017-02-28 11:18:11 -08:00