Commit Graph

95599 Commits

Author SHA1 Message Date
Jenkins
f077783cbd
Add some tests 2018-12-10 13:43:54 -07:00
twangboy
2dde12add3
Fix one more lint item 2018-12-10 13:43:53 -07:00
twangboy
c55b7b4343
Fix some lint 2018-12-10 13:43:53 -07:00
twangboy
1247598f28
Add more policies
Adds more policies
Fixes bug in netsh salt util
Uses __context__ to speed things up
Fixes bug in the state where it was reporting changes when no changes
occurred
2018-12-10 13:43:53 -07:00
twangboy
b2b97959d0
Fix overly long lines 2018-12-10 13:43:53 -07:00
twangboy
f18d1aa890
Add additional policies that use netsh 2018-12-10 13:43:52 -07:00
twangboy
cb50648715
Add versionadded tags 2018-12-10 13:43:52 -07:00
twangboy
00cbf26d5e
Add the netsh mechanism to the lgpo module
Creates a new salt util for netsh and lgpo
Adds the netsh mechanism to the lgpo module
Adds additional functions to the firewall module
2018-12-10 13:43:39 -07:00
Mike Place
035129646e
Merge pull request #50783 from sathieu/gitfs_stalerefs_unicode
gitfs/git_pillar: Fix UnicodeDecodeError while cleaning stale refs
2018-12-10 13:34:52 -07:00
Mike Place
deadf9c2d0
Merge pull request #50765 from ClaudiuPID/fix-icinga2-cert-path
Fix icinga2 cert path
2018-12-10 11:10:23 -07:00
Mike Place
9f8289be9c
Merge pull request #50692 from terminalmage/update-tests
Update a couple test modules to use with_tempdir/with_tempfile decorators
2018-12-10 10:24:02 -07:00
Mike Place
3a71567f43
Merge pull request #50768 from sathieu/git_pillar_all_saltenvs
git_pillar: Add support for all_saltenvs parameter
2018-12-10 09:39:36 -07:00
Mike Place
ce1842e6b1
Merge branch '2018.3' into fix-icinga2-cert-path 2018-12-10 09:39:15 -07:00
Mike Place
12a8447741
Merge pull request #50796 from dwoz/issue48801
Fix #48801 min, max, inact, and warn changes
2018-12-10 09:30:13 -07:00
Mike Place
b266e8b622
Merge pull request #50804 from Ch3LL/bp-49355
Back-port #49355 to 2018.3
2018-12-10 09:21:29 -07:00
Michael Lustfield
d34eadec0c
Use a temp file instead of /etc/network/interfaces for unit tests. 2018-12-10 10:45:42 -05:00
Michael Lustfield
622c354683
Support reading multiple addresses from interface files. 2018-12-10 10:45:34 -05:00
Michael Lustfield
15c34fe7a2
Support unicode in space-delimited list; fixes unit tests in py2. 2018-12-10 10:45:26 -05:00
Michael Lustfield
0b5956115b
Added documentation about debian interfaces.d/*. (Fixes: #40262) 2018-12-10 10:45:10 -05:00
Michael Lustfield
1b096fbee6
Removed python lint. 2018-12-10 10:45:01 -05:00
Michael Lustfield
6e4122592a
Finished adding support for multiple IP addresses. 2018-12-10 10:44:44 -05:00
Michael Lustfield
4c7df5fd3c
Cleaned up documentation/examples in states.network:
- Updated debian-based distro comment
- Fixed example of configuring a loopback device
- Cleaned up copy/paste mistakes
- Added more examples
- Verified examples work on Debian 9
2018-12-10 10:44:37 -05:00
Michael Lustfield
601f434b06
Added support for -ipaddrs and -ipv6ipaddrs to modules.debian_ip(). 2018-12-10 10:44:26 -05:00
Michael Lustfield
638f899e6d
Added support for loopback devices to modules.debian_ip(). (Fixes: #38672) 2018-12-10 10:44:15 -05:00
Michael Lustfield
cf61c8d9cf
Added a bunch of unit tests for modules.debian_ip.build_interface(). 2018-12-10 10:44:06 -05:00
Michael Lustfield
b905cf6c12
Added support for dns_{nameservers,search} being a list or string.
Conflicts:
  - salt/templates/debian_ip/debian_eth.jinja
2018-12-10 10:42:34 -05:00
Daniel A. Wozniak
6b9522343e
fix linter errors 2018-12-07 18:41:42 -07:00
Daniel A. Wozniak
87a04df512
Fix #48801 min, max, inact, and warn changes
The _changes method was not properlt reporting mindays, maxdays,
inactdays and warndays values
2018-12-07 17:22:11 -07:00
Mathieu Parent
ef160a67d6
gitfs/git_pillar: Fix UnicodeDecodeError while cleaning stale refs
2018-12-06 11:57:11,495 [salt.utils.gitfs :2341][ERROR   ][866] Exception caught while fetching gitfs remote '__env__ https://git.example.org/somerepo.git': 'ascii' codec can't decode byte 0xc3 in position 0: ordinal not in range(128)
Traceback (most recent call last):
  File "/usr/lib/python2.7/dist-packages/salt/utils/gitfs.py", line 2329, in fetch_remotes
    if repo.fetch():
  File "/usr/lib/python2.7/dist-packages/salt/utils/gitfs.py", line 757, in fetch
    return self._fetch()
  File "/usr/lib/python2.7/dist-packages/salt/utils/gitfs.py", line 1271, in _fetch
    cleaned = self.clean_stale_refs()
  File "/usr/lib/python2.7/dist-packages/salt/utils/gitfs.py", line 605, in clean_stale_refs
    if line.startswith(marker):
UnicodeDecodeError: 'ascii' codec can't decode byte 0xc3 in position 0: ordinal not in range(128)

The environement variables are not sanitized, and as we use LANG=fr_FR.utf8. Calling the same command prints non-ascii:

root@salt-master:/var/cache/salt/master/git_pillar/51958f355141ebce331e186a5230c20f2d0264025054eeb2fc2c5b3b81ab53a0# git remote prune origin
Élimination de origin
URL : https://git.example.org/somerepo.git
* [éliminé] origin/toto

Inspired by a8591a094a/git/cmd.py (L694)
2018-12-07 06:49:50 +01:00
Mike Place
dc9414cd0e
Merge pull request #50767 from dwoz/ldap_no_pass
Make sure ldap passwords are honored
2018-12-05 15:59:16 -07:00
Daniel A. Wozniak
67aa591d1e
Fix linter errors 2018-12-05 13:12:34 -07:00
Mathieu Parent
e9714126ac
git_pillar: Add support for all_saltenvs parameter
On the road to #32245.
2018-12-05 20:56:29 +01:00
Daniel A. Wozniak
be3945afeb
Remove crufty import 2018-12-05 12:56:16 -07:00
Daniel A. Wozniak
91f50a4ce7
Add more ldap auth tests for ZD-2993 2018-12-05 12:55:26 -07:00
Daniel A. Wozniak
055a8d5d74
Make sure ldap passwords are honored 2018-12-05 12:46:10 -07:00
Erik Johnson
60aa0d5672
Merge pull request #50626 from sathieu/git_pillar_mountpoint_and_root
git_pillar: Allow root and mountpoint parameters together
2018-12-05 11:46:58 -06:00
Mathieu Parent
5423c27f84
git_pillar: Allow root and mountpoint parameters together
Fixes: #50364
2018-12-05 05:20:04 +01:00
Daniel Wozniak
c02387ed1f
Merge pull request #50745 from bbinet/fix-grafana-dashboard-update
Fix grafana dashboard updating when nothing has changed
2018-12-04 12:26:31 -07:00
Bruno Binet
7019d47ce9 Fix grafana dashboard updating when nothing has changed
The new field "uid" (from grafana5) must be ignored: it will always
differ as it is generated server side by grafana when creating the
dashboard.
2018-12-04 18:19:51 +01:00
Daniel Wozniak
ae81498a5e
Merge pull request #50737 from garethgreenaway/merge-2017.7
[develop] Merge forward from 2017.7 to 2018.8
2018-12-04 09:02:12 -07:00
Gareth J. Greenaway
fde8db5ef4
Merge branch '2017.7' into merge-2017.7
Conflicts:
	tests/support/case.py
2018-12-04 15:53:04 +01:00
Mike Place
36a4a1af49
Merge branch '2018.3' into update-tests 2018-12-03 13:04:16 -07:00
Erik Johnson
be14517c5c
Make x509 tests use tempfiles instead of hard-coding them
This keeps us from needing to manually clean them up in the tearDown
2018-12-03 13:13:14 -06:00
Daniel Wozniak
246c055676
Merge pull request #50718 from dwoz/run_run_timeout
Honor run_run timeout for shell tests
2018-12-03 09:00:23 -07:00
Daniel A. Wozniak
ecd84863cd
Honor run_run timeout for shell tests 2018-12-02 15:21:17 -07:00
Gareth J. Greenaway
979b3aa9e6
Merge pull request #50702 from damon-atkins/jenkins_pylint
Fixes/Improvements to ci/lint.
2018-11-30 20:45:22 -08:00
Mike Place
22acaaa4a1
Merge pull request #50632 from astronouth7303/loader-exception-handler
Better handle errors in entry points
2018-11-30 11:49:55 -07:00
Mike Place
edaa9fed03
Merge pull request #50685 from Ch3LL/merge_2018.3
[2018.3] Merge forward from 2017.7 to 2018.3
2018-11-30 11:46:06 -07:00
Mike Place
7cb2405e48
Merge pull request #50690 from garethgreenaway/50016_ensure_path_is_str
[2018.3] fixes to augeas_cfg module
2018-11-30 11:44:41 -07:00
Damon Atkins
5936066e62 ensure archiveArtifacts are always collected. Use CHANGE_BRANCH to detect merge-forward 2018-11-30 23:36:07 +11:00