Commit Graph

89411 Commits

Author SHA1 Message Date
Giandom
573a0a4143
added-highstate-output-to-slack-engine 2017-12-14 19:20:38 +01:00
Tom Williams
a1184c8c2c INFRA-5975 - trimmed too much 2017-12-14 13:15:27 -05:00
rallytime
3e319d50b3
Merge branch '2017.7' into 'oxygen'
Conflicts:
  - README.rst
  - salt/modules/win_pkg.py
  - salt/utils/process.py
2017-12-14 13:01:29 -05:00
Nicole Thomas
3ed7a29c56
Merge pull request #44973 from gtmanfred/oxygen
fix proxyminion tests with py3
2017-12-14 12:53:22 -05:00
Nicole Thomas
e9bbc23b11
Merge branch '2017.7' into libcloud_dns_fixes 2017-12-14 12:38:05 -05:00
Nicole Thomas
c4f0894689
Merge pull request #44900 from xuhcc/rbenv-ret-fix
Fix TypeError during rbenv ruby installation when rbenv is not found
2017-12-14 12:37:13 -05:00
Tom Williams
e4b6002cac INFRA-5975 - documentation and formatting fixes 2017-12-14 12:31:24 -05:00
Jasper Lievisse Adriaanse
5d4d1e29ff
status.meminfo: add OpenBSD support 2017-12-14 18:00:27 +01:00
Nicole Thomas
9a7406207f
Merge pull request #44972 from terminalmage/bp-44958
Backport #44958 to 2016.11 branch
2017-12-14 11:56:01 -05:00
Nicole Thomas
0fdf346e99
Merge pull request #44976 from bodhi-space/44303
Fix bad variable name in boto3_route53 module - resolves #44303
2017-12-14 11:07:28 -05:00
twangboy
8316481944
Comment the salt import 2017-12-14 09:04:26 -07:00
Nicole Thomas
ae8dd2e202
Merge pull request #44982 from terminalmage/docker-unicode
[PY3] Add unicode_literals to docker state/execution modules
2017-12-14 11:03:15 -05:00
twangboy
fe34f0c877
Set owner properly on Windows 2017-12-14 08:57:30 -07:00
Nicole Thomas
4dda5f9977
Merge pull request #44985 from terminalmage/salt-ext-unicode
[PY3] Add unicode_literals to files in root salt/ dir (and associated tests)
2017-12-14 10:48:52 -05:00
Nicole Thomas
aef2521853
Merge pull request #44986 from terminalmage/salt.output-unicode
[PY3] Add unicode_literals to outputters
2017-12-14 10:47:04 -05:00
Denys Havrysh
da5e580f8c
[DOC] Add doc page reference for schedule util module 2017-12-14 16:53:07 +02:00
Erik Johnson
f73110ff83
Unskip this test
It has been edited to work properly and should be fine in PY3 now.
2017-12-14 08:40:58 -06:00
Erik Johnson
b646691329
Clarify encoding arg in file state/module 2017-12-14 08:40:58 -06:00
Nicole Thomas
1bd260a663
Merge pull request #44821 from jasperla/status/openbsd/cpuinfo
make status.cpuinfo work on non-FreeBSD
2017-12-14 09:29:27 -05:00
Nicole Thomas
aec551540a
Merge pull request #44095 from rdutch/aix_account_beacon
add aix account lockout beacon
2017-12-14 09:11:36 -05:00
Nicole Thomas
d9a0c02cea
Merge pull request #44877 from terminalmage/os.walk
Replace os.walk with a helper function
2017-12-14 09:09:56 -05:00
Nicole Thomas
b3a75ed713
Merge pull request #44901 from sahama/bugfix_for_beacon_state
change beacons.enable_job to beacons.enable_beacon
2017-12-14 09:09:15 -05:00
Nicole Thomas
64b9e9a5bf
Merge pull request #44910 from jasperla/status/openbsd/version
make status.version work on OpenBSD
2017-12-14 09:08:45 -05:00
Nicole Thomas
a1483af113
Merge pull request #44914 from jasperla/status/openbsd/netstat
status.netstats: add OpenBSD support
2017-12-14 09:07:32 -05:00
Nicole Thomas
95f0be2116
Merge pull request #44950 from gtmanfred/route53
Add Healthcheck for route53 module
2017-12-14 09:02:54 -05:00
Nicole Thomas
f0c2cf3cec
Merge pull request #44974 from twangboy/win_skip_test_parsers
Skip test_log_created on Windows
2017-12-14 08:59:24 -05:00
Bo Maryniuk
0876bfc9c6 Split only strings, if they are such 2017-12-14 14:43:52 +01:00
Bo Maryniuk
2afc7af65e Lintfix: PEP8 2017-12-14 14:43:17 +01:00
Bo Maryniuk
27beed078b Use unicode literals 2017-12-14 14:43:02 +01:00
Erik Johnson
0f43bfc21b
[PY3] Add unicode_literals to outputters 2017-12-14 01:20:57 -06:00
Jasper Lievisse Adriaanse
fe7f0b5fcc
status.cpuinfo: unbreak on OpenBSD and add NetBSD support
the field separator on OpenBSD and NetBSD is '=', not ':'.
verified on OpenBSD, assuming this now works on NetBSD based on
upstream documentation for sysctl(8)
2017-12-14 07:56:39 +01:00
Tom Williams
54cf591078
INFRA-6108 - boto_elb.present() errors if test=True and ELB doesn't exist 2017-12-14 07:55:26 +01:00
Erik Johnson
2a8d7e2a0b
[PY3] Add unicode_literals to files in root salt/ dir (and associated tests) 2017-12-14 00:47:44 -06:00
Erik Johnson
5e1f75aab0
[PY3] Add unicode_literals to docker state/execution modules 2017-12-13 22:49:23 -06:00
Tom Williams
a1a1ab3b42
Merge branch 'develop' into 44303 2017-12-13 22:42:28 -05:00
Daniel Wallace
ba98043de9
fix test 2017-12-13 17:18:02 -07:00
Connor Wolf
5330d16ff9
Merge branch 'develop' into develop 2017-12-13 15:27:29 -08:00
Erik Johnson
c3332c857f
Clarify jinja filter documentation 2017-12-13 16:43:45 -06:00
Erik Johnson
1bfc53fc57
Update file state/execution modules and associated files with unicode_literals
This updates the file state and execution modules to use
unicode_literals. Since the serializers and the cmd module are touched
by the file state/exec module, those are also updated here, as well as
the cmd state module, for good measure.

Additionally, I found that salt.utils.data.decode_dict (and decode_list)
are misnamed for what they actually do. Since they *encode* the
contents, the functions should be named encode_dict and encode_list,
respectively. And we also should have counterparts which actually
decode, so I've added them. The compatibility functions from salt.utils
still use the old "decode" names to preserve backward compatibility, but
they now invoke the renamed "encode" functions in salt.utils.data. Note
that this means that the compatibility functions
salt.utils.decode_dict/list, and their cognates in salt.utils.data now
do different things, but since the move to salt.utils.data is also
happening in the Oxygen release this is as good a time as any to correct
this oversight.

I've updated the jinja filter docs to include information on the renamed
jinja filters, and also added a section on jinja filter renaming to the
Oxygen release notes. There was another filter that I renamed during the
process of moving functions from salt.utils which I did not properly
document in the release notes, so this is now included along with the
others.
2017-12-13 16:43:45 -06:00
Erik Johnson
6d52aeb739
Replace os.walk with a helper function
On PY2, when os.walk is invoked with a str as input, the paths in the
return data are all str types as well. This leaves undecoded unicode
data in those strings when files/dirs under the top dir that was passed
contain unicode characters in the filename.

>>> import os
>>> list(os.walk('temp'))
[('temp', [], ['\xd0\x94.txt', 'foo.txt'])]
>>> list(os.walk(u'temp'))
[(u'temp', [], [u'\u0414.txt', u'foo.txt'])]

The helper introduced here ensures that we always invoke os.walk with a
unicode top-level dir, so that we get unicode types in the return data.
2017-12-13 16:38:12 -06:00
Nicole Thomas
b6725536f8
Merge pull request #44917 from jasperla/openbsdpkg/installurl
openbsdpkg: sync comment with reality
2017-12-13 17:18:53 -05:00
Nicole Thomas
a8fa393459
Merge pull request #44915 from jasperla/status/openbsd/cpustats
status.cpustats: add OpenBSD support
2017-12-13 17:17:43 -05:00
Nicole Thomas
45536ab447
Merge pull request #44919 from jasperla/status/openbsd/nproc
status.nproc: add support for Darwin/FreeBSD/OpenBSD
2017-12-13 17:14:33 -05:00
Tom Williams
c382558bce 44303 - resolves #44303 2017-12-13 17:06:02 -05:00
twangboy
40665d7b08
Skip test_log_created on Windows 2017-12-13 14:12:07 -07:00
Daniel Wallace
00383bd9b0
make dummy proxy module py3 compatible 2017-12-13 13:59:18 -07:00
Daniel Wallace
f74e108560
fix starting proxy minion on py3 2017-12-13 13:44:56 -07:00
Daniel Wallace
fceea0ad01
fix py3 tests 2017-12-13 13:43:48 -07:00
Erik Johnson
a416bf0112
No need to manually do connect_pub, use listen=True in run_job 2017-12-13 14:28:15 -06:00
Erik Johnson
3ec004bd2e
Fix a race condition in manage runner
The runner was not connecting the client event listener to the event
bus. This meant that all events between the `client.run_job()` and when
`client.get_cli_event_returns()` began polling for events would be lost.
Before `get_cli_event_returns` (via LocalClient's `get_iter_returns`)
gets around to polling for events, it first checks to see if the job
cache has a record of the jid it's querying. When using a custom
returner for the job_cache, one which has even a little bit of latency,
return events from minions may sneak past before the jid lookup is
complete, meaning that `get_iter_returns` will not return them and the
manage runner will assume the minion did not respond.

Connecting to the event bus before we run the test.ping ensures that we
do not miss any of these events.
2017-12-13 14:27:30 -06:00