Commit Graph

85135 Commits

Author SHA1 Message Date
rallytime
4c2f504a85
Merge branch '2016.11' into '2017.7'
No conflicts.
2018-02-20 17:43:33 -05:00
Nicole Thomas
e197a0fbc5
Merge pull request #46076 from rallytime/bp-46066
Back-port #46066 to 2016.11
2018-02-20 16:48:41 -05:00
Nicole Thomas
14fe423e0c
Merge pull request #46094 from kstreee/fix-memory-leak
Fix memory leak
2018-02-20 16:36:01 -05:00
Nicole Thomas
c72c1bde5f
Merge pull request #46093 from wedge-jarrad/contributing-doc-typo
Fix contributing doc typo
2018-02-20 12:37:27 -05:00
Nicole Thomas
320c2037e1
Merge pull request #46097 from vutny/fix-https-link
[DOC] Put https link to the formulas doc page
2018-02-20 12:07:38 -05:00
Nicole Thomas
0eb137fb4e
Merge pull request #46103 from bdrung/2017.7
Fix skipping Kubernetes tests if client is not installed
2018-02-20 11:33:41 -05:00
Benjamin Drung
dd3f936557 Fix skipping Kubernetes tests if client is not installed
When the Kubernetes client is not installed, the import of
salt.modules.kubernetes will still succeed, but HAS_LIBS will be set to
False (since the library import will be covered by a try-except clause).

Therefore expect the salt.modules.kubernetes to always succeed and check
kubernetes.HAS_LIBS instead for the presence of the kubernetes library.

Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>
2018-02-19 12:32:14 +01:00
Denys Havrysh
2062fd0e5c
[DOC] Put https link to the formulas doc page 2018-02-19 12:59:00 +02:00
gwiyeong
48080a1bae
Fixes memory leak, saltclients should be cleaned after used. 2018-02-19 16:31:32 +09:00
gwiyeong
aba00805f4
Adds set_close_callback function to removes stream instance after closed from a set streams. 2018-02-19 14:44:49 +09:00
Wedge Jarrad
5a0fe104f7 Fix contributing doc typo 2018-02-18 10:57:28 -08:00
Nicole Thomas
c3a938e994
Merge pull request #46070 from Ch3LL/fix-doc-dns
add required arg to dns_check jinja doc example
2018-02-16 15:00:44 -05:00
Nicole Thomas
01042e9d77
Merge pull request #46067 from rallytime/bp-45994
Back-port #45994 to 2017.7
2018-02-16 14:55:26 -05:00
rallytime
b94d73c53e
Pin tornado version in requirements file
tornado needs to be >= 4.2.1, but less that 5.0.

Tornado 5.0 is introducing backwards-incompatible changes. Therefore,
we need to pin the version of tornado in base.txt until we can fix
supporting Tornado 5.0 in Salt.

Refs #45790
2018-02-16 12:05:18 -05:00
Ch3LL
2a5d855d97
add required arg to dns_check jinja doc example 2018-02-16 10:48:57 -05:00
Lee Webb
a07bb48726
Correct formatting for lint 2018-02-16 10:21:42 -05:00
Lee Webb
e8678f633d
Fix Comment being None not '' and inject quotes into the TXT ChangeRecords 2018-02-16 10:21:42 -05:00
Nicole Thomas
5e0e2a30e2
Merge pull request #45932 from The-Loeki/fix_cmd_run_all_bg
Fix cmd run_all bg error
2018-02-16 09:53:14 -05:00
Nicole Thomas
45ace39961
Merge pull request #46062 from vutny/pg-user-state-fix-typo
Fix typo in postgres_user.present state function
2018-02-16 09:44:28 -05:00
Denys Havrysh
a5fbe4e95e
Fix typo in postgres_user.present state function 2018-02-16 11:41:01 +02:00
Nicole Thomas
edcb64de76
Merge pull request #45763 from twangboy/win_fix_path_rehash
Fix rehash function in win_path.py
2018-02-15 15:05:15 -05:00
Nicole Thomas
a46fbc546c
Merge pull request #46042 from jfindlay/file_tree_doc
Revise file_tree pillar module documentation
2018-02-15 14:29:51 -05:00
Nicole Thomas
3cb83ea87e
Merge pull request #45992 from bgridley/fix-routes-present-state
Add vpc_peering_connection_id to describe_route_tables route_keys
2018-02-15 13:56:55 -05:00
Nicole Thomas
de86126dd8
Merge pull request #46013 from rallytime/bp-45598
Back-port #45598 to 2017.7
2018-02-15 11:11:04 -05:00
Justin Findlay
0ba4954a4b
salt.pillar.file_tree revise module documentation 2018-02-14 14:14:57 -08:00
Justin Findlay
3c6a5bf967
salt.pillar.file_tree provide better debug info 2018-02-14 14:14:51 -08:00
Justin Findlay
bb1cdc451e
salt.pillar.file_tree no stack trace when nodegroups undefined 2018-02-14 14:14:16 -08:00
Nicole Thomas
07e5735471
Merge pull request #46016 from rallytime/bp-45826
Back-port #45826 to 2017.7
2018-02-14 13:16:23 -05:00
Nicole Thomas
a1f4092811
Merge pull request #46015 from rallytime/bp-45785
Back-port #45785 to 2017.7
2018-02-14 13:16:08 -05:00
Nicole Thomas
96097c037e
Merge pull request #46012 from rallytime/bp-45462
Back-port #45462 to 2017.7
2018-02-14 13:14:55 -05:00
Nicole Thomas
1279924f5f
Merge pull request #45991 from terminalmage/fix-duplicate-extra-opts
yumpkg: Fix a couple issues with _get_extra_opts
2018-02-14 11:48:28 -05:00
Nicole Thomas
8a60635da0
Merge pull request #46000 from terminalmage/issue45910
salt.states.reg.present: Prevent traceback when reg data is binary
2018-02-14 10:55:41 -05:00
Erik Johnson
916766f651
yumpkg: Fix a couple issues with _get_extra_opts
`_get_extra_opts()` and `_get_branch_option()` were unnecessarily
quoting the value, causing it to be interpreted as a literal quote by
`subprocess.Popen()`.

Also, because there were separate helpers for repo options,
disableexcludes, branch options, and extra options, and specifically
because `_get_extra_opts()` parses *all* kwargs, any of the options from
the other helper funcs would end up being added to the command line
twice if `_get_extra_opts()` was used.

This commit consolidates all of the kwarg inspection and CLI opts
construction to a single helper function. It also adds unit tests to
make sure that we are formatting our commands properly.

Additionally, it makes a minor fix in `refresh_db()` which was not
accounted for when we changed the osmajorrelease grain to an integer in
2017.7.0.
2018-02-13 22:46:27 -06:00
Erik Johnson
8cf13325ee
salt.states.reg.present: Prevent traceback when reg data is binary
This prevents a failed decode of undecodable data from resulting in a
traceback by catching the exception and just using the original value in
the changes dict.
2018-02-13 16:23:55 -06:00
Nicole Thomas
1f44e285dc
Merge pull request #46011 from terminalmage/fix-solaris-runas
cmdmod.py: runas workaround for platforms that don't set a USER env var
2018-02-13 17:03:10 -05:00
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