valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
95,782 Commits 24 Branches 182 Tags 341 MiB
335088b96f
Commit Graph

95782 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Erik Johnson
dcdb9b23b1
Merge pull request #50750 from bewing/pepa12 
Fix last key detection in pillar.pepa`key_value_to_tree`
 2018-12-10 08:45:34 -06: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
b19925553d
Merge branch '2017.7' into service_unmask 2018-12-06 11:24:34 -07:00
Mike Place
cb85d5d31f
Merge pull request #50733 from marmarek/patch-3 
Report salt-call exit code from ssh_py_shim.py
 2018-12-06 11:05:30 -07:00
Mike Place
b086ff362c
Merge pull request #50756 from GwiYeong/local-client-fix 
missing minion result data bug.
 2018-12-06 10:43:23 -07: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
GwiYeong
c4880929ce
fix local client missing minion return 2018-12-05 19:34:25 +09:00
kstreee
98cc63a7f0
Fixes a memory leak un-cleared stream connections. 2018-12-05 17:24:21 +09:00
Mathieu Parent
5423c27f84
git_pillar: Allow root and mountpoint parameters together 
Fixes: #50364
 2018-12-05 05:20:04 +01:00
Brandon Ewing
9931a41955
Fix last key detection in pepa key_value_to_tree 
pepa.key_value_to_tree only checks the name of the key when attempting
to identify the last key in a flattened key.  This can lead to strange
behavior when the final key name also occurs earlier in the flatkey.

This change explicitly checks that we are the final key in flatkey
prior to setting value.  Test included.

Also see mickep76/pepa#11 and mickep76/pepa#12
 2018-12-04 20:35:34 -06: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
Marek Marczykowski-Górecki
1011421781
Report salt-call exit code from ssh_py_shim.py 
Fixes #50727
 2018-12-04 15:00:26 +01:00
Jamie Bliss
03e31688a1
whitelist_modules is linked via enable_whitelist_modules for some reason? idk 2018-12-04 04:31:47 -05:00
Jamie Bliss
5ca1f8e2a5
Typos 2018-12-04 04:20:43 -05:00
Jamie Bliss
7cb1a87fe6
Add a quick index of loader-related settings 2018-12-04 02:08:39 -05:00
Jamie Bliss
318ca48127
Make a note to not import modules 2018-12-04 01:35:27 -05:00
Jamie Bliss
6294658424
Merge remote-tracking branch 'origin/2017.7' into loader-docs 2018-12-04 01:33:23 -05:00
Mike Place
36a4a1af49
Merge branch '2018.3' into update-tests 2018-12-03 13:04:16 -07:00
matt LLVW
38addd19e7 salt style guideline 2018-12-03 21:02:43 +01: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
Jamie Bliss
678958e559
Editing 2018-11-30 19:21:54 -05:00
Jamie Bliss
9d596298ea
Merge branch '2017.7' into loader-docs 2018-11-30 19:20:11 -05:00