David Boucha
c557d76fe7
Add another example for a module.run state.
...
ZD#1162
2017-03-01 13:12:48 -07:00
Joseph Hall
8058bbe6ca
Just set all the default minion opts and be done with it
2017-03-01 13:12:18 -07:00
Joseph Hall
925eb7ffea
Add environment to test
2017-03-01 12:56:23 -07:00
Mike Place
320b39bc12
Fix broken test and lint issue
2017-03-01 11:57:28 -07:00
Mike Place
2fdbe6f856
Merge pull request #39675 from nv043/cron-range
...
Added range for minute and hour in cron module
2017-03-01 11:49:23 -07:00
Mike Place
ff59517e2c
Merge pull request #39715 from lwh/dockerng_sysctl
...
Added sysctls to dockerng configuration
2017-03-01 11:48:19 -07:00
Mike Place
2484e52716
Merge pull request #39743 from rallytime/merge-develop
...
[develop] Merge forward from 2016.11 to develop
2017-03-01 11:46:47 -07:00
Mike Place
8e8300e8c8
Merge pull request #39759 from s0undt3ch/features/pytest-salt-daemons
...
Update development requirements file
2017-03-01 11:44:29 -07:00
Joseph Hall
88a38d5ee9
Add id to test
2017-03-01 11:42:05 -07:00
Joseph Hall
8b8320d56d
Add renderer variable to tests
2017-03-01 10:41:52 -07:00
Joseph Hall
829b5b3ab3
It's self.client now, not client
2017-03-01 10:40:31 -07:00
Joseph Hall
bd2e1427ad
Add cachedir to test
2017-03-01 10:40:31 -07:00
Joseph Hall
56b8d44c26
Forgot to name a kwarg
2017-03-01 10:40:30 -07:00
Joseph Hall
4f51c67bee
Add opts to the template vars
2017-03-01 10:40:30 -07:00
Joseph Hall
255db60f5a
Add pre and post states to SPM
2017-03-01 10:40:30 -07:00
Mike Place
96a9ee7c03
Merge pull request #39690 from Prolucid/2016.11
...
Add act entry when a key is denied
2017-03-01 10:26:18 -07:00
Mike Place
517842a339
Merge pull request #39696 from twangboy/win_fix_returners_tests
...
Fix job cache tests, add librato return tests
2017-03-01 10:24:59 -07:00
Mike Place
4fc0451d64
Merge pull request #39702 from techhat/spmfiles
...
Add files section to FORMULA files
2017-03-01 10:18:30 -07:00
Mike Place
539aad1e22
One more single quotes
2017-03-01 10:17:06 -07:00
Mike Place
9087bfd44c
Single quotes
2017-03-01 10:15:17 -07:00
Mike Place
0e572e007b
Merge pull request #39726 from terminalmage/remove-traceback
...
Remove ext_pillar traceback from returned error
2017-03-01 10:07:21 -07:00
Mike Place
4a0c2dfcc3
Merge pull request #39725 from bodhi-space/infra4487
...
INFRA-4487 - 'test=True' should return True rather than None if no changes are scheduled.
2017-03-01 10:02:11 -07:00
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
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
