Commit Graph

91763 Commits

Author SHA1 Message Date
Gareth J. Greenaway
07d7e3ca01
Adding a new integration test and corresponding state files to test availabilty of jinja filters when using salt-ssh. 2018-04-06 13:19:10 -07:00
Daniel Wallace
3fb75e903c
enable_ssh_minions does not work with subset yet
This will fail if it selects the localhost minion as the subset minion.
2018-04-06 14:31:01 -05:00
Daniel Wallace
ac4e7cd73f
Merge pull request #46936 from gtmanfred/2018.3
don't copy __pycache__ or .pyc files for kitchen
2018-04-06 14:15:45 -05:00
Daniel Wallace
91474878fa
don't copy __pycache__ or .pyc files for kitchen 2018-04-06 14:15:02 -05:00
Daniel A. Wozniak
0ba32118d9
Add test for bad public key without m2crypto 2018-04-06 11:22:32 -07:00
Daniel A. Wozniak
a44c356233
Clean up bad public key headers
Remove the "RSA" delaration from public key headers generated by
pycryptodome<=3.4.6
2018-04-06 10:56:50 -07:00
Nicole Thomas
fc2f728665
Merge pull request #46925 from terminalmage/fix-file.patch-docstring
Remove reference to directory support in file.patch state
2018-04-06 09:54:46 -04:00
Nicole Thomas
eef6c518e1
Merge pull request #46900 from rallytime/bp-46801
Back-port #46801 to 2017.7
2018-04-06 09:47:43 -04:00
Nicole Thomas
71839b0303
Merge pull request #46899 from rallytime/bp-45116
Back-port #45116 to 2017.7
2018-04-06 09:47:16 -04:00
Nicole Thomas
8105fd9715
Merge pull request #46912 from gtmanfred/openstack
pull latest vm data after building for openstack shade driver
2018-04-06 09:46:41 -04:00
Erik Johnson
97695657f0
Remove reference to directory support in file.patch state
The state was not written to support patching a directory, though the
file.patch remote execution function does support patching a directory.
This was likely just due to a careless copypasta from the remote
execution function's docstring to the state function's.
2018-04-06 06:27:47 -05:00
Matt Phillips
a9866c7a03 fix parallel mode py3 compatibility
parallel: True codepath incompatibilities uncovered by the added tests.
additionally use salt.serializers.msgpack to avoid other py2/py3/back compat
issues.
2018-04-05 22:30:59 -04:00
Nicole Thomas
735ea12960
Merge pull request #46908 from rallytime/merge-2018.3
[2018.3] Merge forward from 2017.7 to 2018.3
2018-04-05 17:27:03 -04:00
Nicole Thomas
9a47afc33b
Merge pull request #46853 from terminalmage/date_format_filter
Add back date_format filter
2018-04-05 16:33:49 -04:00
Daniel Wallace
5ef538f8ad
pull latest vm data after building for openstack shade driver 2018-04-05 15:15:38 -05:00
rallytime
102e966512
Remove redundant section in log setup 2018-04-05 15:09:48 -04:00
rallytime
177c686b52
Update old utils paths to new utils paths 2018-04-05 13:47:22 -04:00
rallytime
0a297e7319
Merge branch '2017.7' into '2018.3'
Conflicts:
  - salt/grains/core.py
  - salt/utils/__init__.py
2018-04-05 13:43:51 -04:00
Erik Johnson
266d13a665
Add back date_format filter
This was not removed from the docs, so it should be supported for the
foreseeable future.
2018-04-05 11:52:47 -05:00
Matt Phillips
6d7730864a removing prereq from test orch
seems to be encountering unrelated preexisting failures in the functionality
unrelated to my changes.
2018-04-05 11:45:25 -04:00
Matt Phillips
6c8a25778f add integration test to runners/test_state to exercise parallel
this should hopefully exercise a few different facets of parallel that were
previously not covered in the code base.
2018-04-05 11:45:25 -04:00
Matt Phillips
2c86f16b39 cherry-pick cdata KeyError prevention from #39832
@ninja- noticed there was some useful code already in _call_parallel_target to
mitigate KeyErrors for potentially empty cdata, but it wasnt being executed due
to the invoking method making the same mistake before calling it. this moves
that code up to eliminate that potential stacktrace.

this should close #39832
2018-04-05 11:45:25 -04:00
Matt Phillips
26a96e8933 record start/stop duration for parallel processes separately
previously durations were only recording the time to spawn the multiprocessing
proc, not the actual time of completion, which is completely wrong. This should
capture the full duration correctly now. We unfortunately have to duplicate
start & complete times instead of using the passed in start_time attr, as that
value is only a time (not date), so it is impossible to re-calculate the full
duration based on that alone (ie, what happens if start_time is 23:59 with
a roll-over to the next day).
This fixes #44828
2018-04-05 11:45:25 -04:00
Matt Phillips
e4844bdf2b revisit previous join() behavior in check_requisites
rather than join()'ing on each running process, we instead use check_running to
assert completion of our processes. This should provide more correct timing results,
as measuring durations of a longer running join()'d process could trample
a shorter parallel process that just happened to be checked after instead of
before.
2018-04-05 11:45:25 -04:00
Matt Phillips
f00a359cdf join() parallel process instead of a recursive sleep
its not clear to me why the recursive calls were chosen originally. this should
address https://github.com/saltstack/salt/issues/43668
2018-04-05 11:45:25 -04:00
Matt Phillips
6e7007a4dc add parallel support for orchestrations
originally the parallel global state requisite did not work correctly when
invoked under an orch - this fixes that; as well as running any other saltmod
state (function, runner, wheel).
2018-04-05 11:45:25 -04:00
yagnik
6a41e8b457
rename jenkins to jenkinsmod 2018-04-05 11:30:00 -04:00
Arif Ali
b92f908da4
fix adding parameters to http.query from sdb yaml 2018-04-05 11:27:33 -04:00
Nicole Thomas
d0f5b43753
Merge pull request #44926 from frogunder/whitelisted_acl
whitelist_acl_test
2018-04-05 11:09:25 -04:00
Mike Place
bd98c49dc7
Merge branch '2018.3' into bugs/ssh_state_test_failures 2018-04-05 09:58:54 -05:00
Mike Place
7d822f9cec
Merge pull request #46464 from gtmanfred/orchestration
fix salt subset in orchestrator
2018-04-05 09:52:00 -05:00
Mike Place
a064a3e695
Merge pull request #46882 from jasperla/smartos/backports
Backport #46280 #46849 #46852 to 2018.3
2018-04-05 09:29:11 -05:00
Mike Place
4e5e291c99
Merge pull request #46873 from terminalmage/utf8-first
Attempt UTF-8 first when decoding/encoding
2018-04-05 09:16:27 -05:00
Mike Place
805ed1c964
Merge pull request #46879 from dwoz/cloudtestfix
Fix multiple typos causing tests to fail
2018-04-05 08:59:28 -05:00
Nicole Thomas
1518762465
Merge pull request #46878 from terminalmage/bp-46874
Backport #46874 to 2018.3
2018-04-05 09:26:03 -04:00
Nicole Thomas
67894e3ee9
Merge pull request #46869 from gtmanfred/2018.3
Always return dictionary for _localectl_status
2018-04-05 09:25:13 -04:00
Jasper Lievisse Adriaanse
47a66975ff fix creating a nic tag on a link with double 0 in the MAC
otherwise we get a message like '12:34:00:56:78:90 is not present on this system.'
as dladm prints the '00' as '0' and we fail to correctly identify
the existing interface.

Fix a linting issue while here
2018-04-05 09:07:18 +02:00
Jasper Lievisse Adriaanse
a3cb0e576e Unbreak creating etherstubs on SmartOS
SmartOS (no longer?) handles setting an MTU for etherstub devices,
so silently drop it in order to maintain the current API.

salt:2066 salt % doas salt-ssh smartos-gz nictagadm.add storage0 etherstub
smartos-gz:
    ----------
    Error:
        Error: Cannot specify MTU for local nic tag

Also fixup two examples while here which failed to run and use
format() in a consistent manner.

Tested on SmartOS 20160204T080230Z and 20180203T031130Z
2018-04-05 09:07:10 +02:00
Jasper Lievisse Adriaanse
e703254990 Remove unneeded checks for binaries in SmartOS modules
This tidies the actual command string building and
makes the code more readable in general. The required
binaries are not likely to disappear after __virtual__
has been evaluated.

Use correct nomenclature when referring to 'compute nodes'.
2018-04-05 09:06:53 +02:00
Nicole Thomas
58c8ff18e2
Merge pull request #46870 from cloudflare/proxy-doc
Correct the documentation for two new proxy modules
2018-04-04 17:48:40 -04:00
Nicole Thomas
18e460fc30
Merge branch '2017.7' into whitelisted_acl 2018-04-04 17:28:40 -04:00
Daniel A. Wozniak
dc54fc53c3
Fix multiple typos causing tests to fail 2018-04-04 14:20:51 -07:00
Nicole Thomas
f70f6de282
Merge pull request #46647 from twangboy/win_fix_test_grains
Fix the tear down function in integration.modules.test_grains
2018-04-04 17:14:05 -04:00
Nicole Thomas
91c078ce12
Merge pull request #46756 from nages13/bugfix-grain-virtual_subtype
fix grains['virtual_subtype'] to show Docker on xen kernels
2018-04-04 16:53:49 -04:00
Nicole Thomas
058bbed221
Merge pull request #46799 from garethgreenaway/46762_prereq_shenanigans_tests
[2017.7] Adding test for PR #46788
2018-04-04 16:41:22 -04:00
John Jawed
d9511d04d4
#43499, zmq setsockopt need to adapt python3 2018-04-04 15:32:34 -05:00
Nicole Thomas
d7e4b9d755
Merge pull request #46729 from terminalmage/expr_match
Performance improvement/error catching in expr_match
2018-04-04 16:25:56 -04:00
Daniel Wallace
1496e985f7
fix pylint 2018-04-04 15:13:59 -05:00
Erik Johnson
cf28eb74aa
Don't log command when output_loglevel == 'quiet' 2018-04-04 14:57:45 -05:00
Daniel Wallace
637cdc6b7b
fix pylint 2018-04-04 14:37:04 -05:00