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
Gareth J. Greenaway
85363189d1
Fixing vault when used with pillar over salt-ssh
2018-02-09 11:46:21 -05:00
rallytime
f51687e903
Merge branch '2016.11' into '2017.7'
...
No conflicts.
2018-02-09 11:34:12 -05:00
Nicole Thomas
7fd00ec752
Merge pull request #45928 from garethgreenaway/45915_fixing_vault_pillar_for_salt_ssh
...
[2017.7] Fixing vault when used with pillar over salt-ssh
2018-02-09 11:32:34 -05:00
Nicole Thomas
fb378cebb0
Merge pull request #45934 from rallytime/bp-45902
...
Back-port #45902 to 2017.7.3
2018-02-09 11:31:07 -05:00
Nicole Thomas
0d74151c71
Merge pull request #45935 from rallytime/bp-45742
...
Back-port #45742 to 2017.7.3
2018-02-09 09:02:25 -05:00
Nicole Thomas
7779fea7ba
Merge pull request #45940 from dmurphy18/fix_aix_cmdmod
...
Fix use of su to use '-' on AIX
2018-02-09 07:09:10 -05:00
Ronald van Zantvoort
771758fbca
Merge branch '2017.7' into fix_cmd_run_all_bg
2018-02-09 08:32:48 +01:00
Erik Johnson
9cd47b39dd
Fix incorrect translation of docker port_bindings -> ports
...
The logic which ensures that we expose ports which are being bound,
even when not explicitly configured, was done incorrectly. UDP ports
were being passed to the API as '1234/udp' instead of (1234, 'udp').
This results in the port not being exposed properly.
The logic has been corrected. Additionally both the "ports" input
translation function, as well as the post-processing code (where the
port numbers configured in port_bindings were being added) both
contained code to "fix" any ports which were configured using
'portnum/tcp', as these must be passed to the API simply as integers. To
reduce code duplication, this normalization is now only performed at the
very end of the post-processing function, after ports have been
translated, and any missing ports from the port_bindings have been
added.
The unit test for the port_bindings input translation code, which was
written based upon the same incorrect reading of the API docs that
resulted in the incorrect behavior, have been updated to confirm the
(now) correct behavior. The unit test for the ports input translation
code has been updated to reflect the new normalization behavior.
Finally, an integration test has been added to ensure that we properly
expose UDP ports which are added as part of the post-processing
function.
2018-02-08 23:23:43 -06:00
twangboy
29912adc15
Move the test_rehash test to test_win_functions
2018-02-08 17:44:30 -07:00
twangboy
adc594c183
Remove duplicate link
2018-02-08 17:44:30 -07:00
twangboy
e84628c1eb
Add some comments to the code
2018-02-08 17:44:30 -07:00
twangboy
d50d5f582f
Add additional info to docs for broadcast_setting_change
2018-02-08 17:44:29 -07:00
twangboy
3a54e09cd9
Rename setting to message
2018-02-08 17:44:29 -07:00
twangboy
a3f9e99bc0
Change to a generic function to broadcast change
2018-02-08 17:44:29 -07:00
twangboy
79299361c3
Create refresh_environment salt util
2018-02-08 17:44:29 -07:00
