Nicole Thomas
8b9adc258e
Merge pull request #46017 from rallytime/merge-2017.7
...
[2017.7] Merge forward from 2017.7.3 to 2017.7
2018-02-13 16:43:14 -05:00
Erik Johnson
8ee0a3a28b
Move Solaris USER workaround up a bit
...
In its previous position, the run_env would not get the workaround when
clean_env was set to True.
2018-02-13 13:42:20 -06:00
rallytime
a06645ce71
Merge branch '2017.7.3' into '2017.7'
...
Conflicts:
- doc/topics/releases/2017.7.4.rst
- salt/utils/vault.py
2018-02-13 13:34:24 -05:00
Philippe Pepiot
1916e5c4a4
Fix selinux.fcontext_policy_present for Centos 6
...
'a' is not a valid filetype for semanage on Centos 6.
Since "a" (all files) is the default behavior of semanage, don't specify a `--ftype` when invoking semanage.
Closes #45825
2018-02-13 13:30:43 -05:00
Ollie Armstrong
ef6ffb1492
Resolve linting errors
2018-02-13 13:27:38 -05:00
Ollie Armstrong
8047066c46
Remove unused import
2018-02-13 13:27:38 -05:00
Ollie Armstrong
8f7c45935a
Add tests for salt.modules.selinux.fcontext_get_policy
2018-02-13 13:27:38 -05:00
Ollie Armstrong
bafb7b4e6e
Ensure parsed fields are stripped
2018-02-13 13:27:38 -05:00
Ollie Armstrong
a830a6e819
m/selinux.fcontext_get_policy allow long filespecs
...
The previous logic of matching the output of `semanage fcontext --list` did not
allow for filespecs that were longer than 49 characters. This was due to the
output of the semanage tool not conforming to the expected output.
We used to expect that the after the filespec would be at least two spaces.
However, with long filespecs there is only a single space separating it and the
next field (the file type).
This modifies the regular expression that we use to match the line to accept one
or more spaces as field delimeters.
However, this causes problems when we attempt to split the three fields into a
python dictionary. We cannot use the same logic as previously of using the field
delimeter as the file type field itself can contain a space. Instead we use a
separate regular expression to parse the line into its component parts.
Fixes #45784 .
2018-02-13 13:27:38 -05:00
Lee Webb
2ea3fef543
No lazy logging
2018-02-13 13:24:04 -05:00
Lee Webb
f427b0febc
Change formatting style of logging lines per review
2018-02-13 13:23:59 -05:00
Lee Webb
ebb244396b
Patch around ResourceRecords needing to be present for AliasTarget entries to work
2018-02-13 13:23:49 -05:00
Jeremy McMillan
9f76836a6c
emit port cli version, variants as separate args
2018-02-13 13:19:24 -05:00
Nicole Thomas
d20ff89414
Merge pull request #45988 from rallytime/bp-45797
...
Back-port #45797 to 2017.7
2018-02-13 12:49:02 -05:00
Nicole Thomas
b18087cee0
Merge pull request #45711 from bdrung/fix-unicode-tests
...
Fix Unicode tests when run with LC_ALL=POSIX
2018-02-13 12:42:06 -05:00
Erik Johnson
13cdb52690
cmdmod.py: runas workaround for platforms that don't set a USER env var
...
Solaris doesn't set a USER env var in its default environment, that is
if you run `su - someuser -c env` you get a HOME, PWD, LOGNAME, etc. env
var, but not a USER. This commit makes sure that the USER env var is set
to the runas user.
2018-02-13 11:41:41 -06:00
Nicole Thomas
5271fb1d40
Merge pull request #45878 from damon-atkins/2017.7_fix_ec2_pillar
...
ec2_pillar update to fix finding instance-id
2018-02-13 12:34:13 -05:00
Nicole Thomas
6d534c6e7e
Merge pull request #46009 from Ch3LL/rn_7.4
...
Add 2017.7.4 Release Notes with PRs
2018-02-13 11:40:29 -05:00
Ch3LL
ac0baf4b34
Add 2017.7.4 Release Notes with PRs
2018-02-13 11:31:20 -05:00
Nicole Thomas
cf367dbd04
Merge pull request #45942 from terminalmage/issue45679-2017.7
...
Fix incorrect translation of docker port_bindings -> ports (2017.7 branch)
2018-02-13 11:10:02 -05:00
Nicole Thomas
30fb8f7be0
Merge pull request #45467 from twangboy/win_exclude_hidden
...
Exclude hidden directories in pkg.refresh_db
2018-02-13 11:07:07 -05:00
Nicole Thomas
ca76a0b328
Merge pull request #45981 from gtmanfred/2017.7.3
...
use local config for vault when masterless
2018-02-13 10:22:00 -05:00
Ronald van Zantvoort
f83da27ca5
Merge branch '2017.7' into fix_cmd_run_all_bg
2018-02-13 10:30:26 +01:00
Ben Gridley
679787699c
Add vpc_peering_connection_id to describe_route_tables route_keys
...
This is required to fix state module function _routes_present when using a vpc_peering_connection.
2018-02-12 16:06:32 -07:00
Lars Wagner
953a400d79
follow symlinks
2018-02-12 17:21:38 -05:00
Nicole Thomas
dae41de7a8
Merge pull request #45959 from rallytime/state-doc-update
...
A couple of grammar updates for the state compiler docs
2018-02-12 17:17:48 -05:00
Nicole Thomas
007214f7bf
Merge pull request #45908 from DimensionDataResearch/fix/issue/45884
...
Fix for #45884 ("TypeError: can't serialize <NodeImage" when calling salt-cloud with the dimensiondata driver)
2018-02-12 17:05:28 -05:00
twangboy
ea41215646
Make the regex pattern less greedy
2018-02-12 14:03:31 -07:00
twangboy
6d223cffa7
Add tip about passing bogus saltenv
2018-02-12 14:03:31 -07:00
twangboy
1282ae3a93
Skip hidden first
2018-02-12 14:03:30 -07:00
twangboy
437a457911
Skip hidden dirs in genrepo
2018-02-12 14:03:30 -07:00
twangboy
87dc554dc3
Add final updates to docs
2018-02-12 14:03:30 -07:00
twangboy
3646d5c897
Fix some docs formatting, add some warnings
2018-02-12 14:03:30 -07:00
twangboy
35c81faf5a
Log the source_dir when caching the files
2018-02-12 14:03:29 -07:00
twangboy
91c3da8dfd
Improve docs for pkg.refresh_db
2018-02-12 14:03:29 -07:00
twangboy
4803d92707
Add some documentation
2018-02-12 14:03:29 -07:00
twangboy
08b82e0875
Fix lint error, use raw
2018-02-12 14:03:29 -07:00
twangboy
2f712691cf
Exclude hidden directories in pkg.refresh_db
2018-02-12 14:03:28 -07:00
Nicole Thomas
efcbfa868c
Merge pull request #45985 from garethgreenaway/2017_7_fixing_mac_tests_again
...
[2017.7] Backport #45894 - Missing `format` in the call to write.
2018-02-12 15:22:30 -05:00
Daniel Wallace
0d448457dc
apparently local is not set by default
2018-02-12 12:53:59 -07:00
Gareth J. Greenaway
7b8dc14433
Missing format in the call to write.
2018-02-12 11:07:11 -08:00
Nicole Thomas
bf03abd07c
Merge pull request #45958 from garethgreenaway/backport-fixing_mactests_queue_full
...
Backporting #45935 to 2017.7
2018-02-12 11:25:07 -05:00
Daniel Wallace
2a92f4bc16
use local config for vault when masterless
2018-02-12 09:16:38 -07:00
Damon Atkins
0e74025714
Merge branch '2017.7' into 2017.7_fix_ec2_pillar
2018-02-11 03:58:57 +11:00
Nicole Thomas
bab365d6c6
Merge pull request #45949 from rallytime/merge-2017.7
...
[2017.7] Merge forward from 2016.11 to 2017.7
2018-02-09 17:32:08 -05:00
Nicole Thomas
6530649dbc
Merge pull request #45953 from rallytime/bp-45928-2017.7.3
...
Back-port #45928 to 2017.7.3
2018-02-09 17:29:09 -05:00
rallytime
6f781cb95d
A couple of grammar updates for the state compiler docs
2018-02-09 15:46:00 -05:00
Gareth J. Greenaway
25dffaae91
Backporting #45935
2018-02-09 12:34:47 -08:00
Erik Johnson
89cbd72a0d
Don't try to sort ports when translating docker input
...
This sorting was done mainly for the benefit of the test suite, but
Python 3 will raise an error when you try to sort a mixture of int and
tuple types, so sorting breaks down when there are UDP ports.
Instead, this just leaves them as an unsorted list when passed to the
API, and the test suite does the sorting before the assertEqual.
2018-02-09 11:33:10 -06:00
twangboy
b9a2bc7b29
Fix hyperlinks
2018-02-09 09:53:14 -07:00
