Commit Graph

82000 Commits

Author SHA1 Message Date
Bo Maryniuk
1b28c67047 Add unit test for utilising host name as "127" 2017-05-16 12:17:13 +02:00
Bo Maryniuk
0206835bd5 Bugfix: unable to use hostname "127" 2017-05-16 12:16:57 +02:00
Nicole Thomas
cf51b6a037 Merge pull request #41257 from rallytime/merge-develop
[develop] Merge forward from nitrogen to develop
2017-05-15 17:40:05 -06:00
rallytime
a2d2682a7b Fix a couple of doc references for code-block highlighting 2017-05-15 17:38:04 -06:00
Jeremy McDermond
7cdf7b3546 JunOS: Fix Unit Test
When adding the cp.get_file function, we need to add it into the list of
mock functions in the unit test along with get_template or the unit
tests will fail.
2017-05-15 16:12:19 -07:00
rallytime
2690a36cb8 Remove doc ref files for search runner
The search runner and related code was removed in #41245
2017-05-15 16:48:21 -06:00
Nicole Thomas
631c541485 Merge pull request #41245 from thatch45/develop
Remove Salt Search system, this never worked
2017-05-15 16:45:24 -06:00
rallytime
d23010a114 Merge branch '2016.11' into 'nitrogen'
Conflicts:
  - salt/modules/aptpkg.py
  - salt/states/libcloud_dns.py
  - salt/states/pkg.py
  - tests/integration/modules/test_pkg.py
  - tests/unit/modules/test_mac_brew.py
  - tests/unit/modules/test_pkgutil.py
  - tests/unit/modules/test_zypper.py
  - tests/unit/states/libcloud_dns_test.py
2017-05-15 16:41:59 -06:00
rallytime
bde9d6cdc0 Merge branch 'nitrogen' into 'develop'
No conflicts.
2017-05-15 16:29:13 -06:00
Nicole Thomas
9290435745 Merge pull request #41223 from rallytime/merge-nitrogen
[nitrogen] Merge forward from 2016.11 to nitrogen
2017-05-15 16:13:33 -06:00
Nicole Thomas
cbe6d00513 Merge pull request #41204 from twangboy/fix_pub_win
Increase timeout for Windows
2017-05-15 14:04:33 -06:00
rallytime
8ee4bbb8eb Add "conf_file" to ADDITIONAL_OPTS for pillar integration tests 2017-05-15 13:52:07 -06:00
Nicole Thomas
bad9e14b94 Merge pull request #41227 from whiteinge/rest_cherrypy-performance-expectations
rest_cherrypy performance expectations docs
2017-05-15 13:27:46 -06:00
Nicole Thomas
d6af99cc99 Merge pull request #41248 from DSRCorporation/bugs/py3_tests_nitrogen
Py3: Fixed timezone test.
2017-05-15 13:27:19 -06:00
Thomas S Hatch
5f01ab2e68 remove search refs 2017-05-15 13:17:25 -06:00
rallytime
62b2fd9857 Use python 2 compatible error numbers instead of PermissionError
The [PermissionError](https://docs.python.org/3.4/library/exceptions.html#PermissionError)
exception is new to PY 3. We need to use something that will work both in
Python 2 and Python 3.

Refs #41249
2017-05-15 12:43:36 -06:00
Nicole Thomas
52c50f068d Merge pull request #41238 from sebw/sebw-mine-doc
Documentation fix: mine.get compound example
2017-05-15 12:19:48 -06:00
Erik Johnson
409a16c5f1 Merge pull request #41206 from skizunov/develop2
opkg may return non-zero but empty stderr
2017-05-15 13:15:42 -05:00
Nicole Thomas
064d51e717 Small grammar fixes 2017-05-15 12:08:50 -06:00
Nicole Thomas
75942235f0 Merge pull request #41220 from rallytime/bp-40246
Back-port #40246 to 2016.11
2017-05-15 11:59:38 -06:00
Mike Place
53d5b3e816 Merge pull request #41244 from cachedout/fix_ipv6_nameserver_grains
Fix ipv6 nameserver grains
2017-05-15 12:55:38 -05:00
abednarik
3d215d32bd Update apt module regarding upgrade against hold packages.
Fixes #41231 and related to #30777.
2017-05-15 14:15:22 -03:00
Mike Place
5af528f00f Merge pull request #41249 from DSRCorporation/bugs/py3_tests
Do not fail to init grains for non-root user.
2017-05-15 12:04:30 -05:00
Mike Place
895fe582eb Merge pull request #41242 from M2Mobi/mysql_socket_auth
Fix changing a mysql user to unix socket authentication.
2017-05-15 12:00:06 -05:00
Mike Place
5a8cec17c2 Merge pull request #41207 from amendlik/kernelpkg
kernelpkg updates
2017-05-15 11:56:56 -05:00
Mike Place
3fec29482d Merge pull request #41164 from miromode/patch-1
ret_config and ret_kwargs in orchestration
2017-05-15 11:55:48 -05:00
Mike Place
50d8fde123 Merge pull request #41101 from terminalmage/issue40940
Fix "latest" keyword for version specification when used with aggregation
2017-05-15 11:52:35 -05:00
Dmitry Kuzmenko
65be90ef21 Do not fail to init grains for non-root user. 2017-05-15 19:45:23 +03:00
Dmitry Kuzmenko
b10730d8a1 Py3: Fixed timezone test. 2017-05-15 19:40:57 +03:00
Jeremy McDermond
adf2b6e6c1 JunOS: Change os_install to use get_file instead of get_template
In the JunOS modules os_install is designed to install operating system
images to the device.  The current code uses get_template to upload the
OS image file to the device.  This does not work because get_template
attempts to load the entire file into memory so that it can process any
template directives inside the file.  The typical JunOS files are so large
that they cause a MemoryError exception in Python.

I can think of no circumstances where it would be useful to template an
OS image file.  Any changes you make to it will break the internal
checksums and cause upgrades to break.  Therefore, I have changed the
code to use get_file which does not have the problem with large files.
This code has been tested in my lab with JunOS 15.1X53-D55.5 version
upgrades on EX2300 switches.
2017-05-15 08:51:10 -07:00
Kees Bos
45348c119f Catch a possible error, especially trigered in unit tests 2017-05-15 17:46:31 +02:00
Thomas S Hatch
ee3c5d0341 Remove Salt Search system, this never worked 2017-05-15 09:46:30 -06:00
Mike Place
f745db1a43
Lint 2017-05-15 09:21:38 -06:00
Mike Place
6e1ab69710
Partial revert of #40934
This reverts most of #40934. The only thing that should have been fixed there was the spurious warning message.

The logic in calculating which nameserver grains is not correct. It merely overwrites what is returned by
salt.utils.dns.parse_resolv instead of choosing what to include.

As a result of that error, in the case where ipv6 is exempted, we don't string-ify the nameserver in the
list comprehension, which in term passes a non-parseable object to the msgpack serializer which results
in a totally broken minion.

I chose not to fix the logic in the block mentioned above because in doing so, we'd remove other items
from the dictionary which are already present which could break some users. We'll have to carefully evaluate
how to accomplish this going forward.
2017-05-15 09:15:49 -06:00
Mike Place
88f49f9146
Revert "Only display IPvX warning if role is master"
This reverts commit 7855cd6ce6.
2017-05-15 09:13:30 -06:00
Peter C. Norton
393d7f98e9 Merge branch 'slack-client-features' of github.com:pcn/salt into slack-client-features 2017-05-15 10:13:04 -04:00
Peter C. Norton
d6613ce227 Disable checks that are bogus or desired
- bogus: missing-whitespace-after-comma... there are so commas!
- desired: broad exception catching on the basis that I don't know
  what exceptions may happen here yet.
2017-05-15 10:10:18 -04:00
Heinz Wiesinger
7d8359766d Fix changing a mysql user to unix socket authentication. 2017-05-15 16:09:02 +02:00
Sébastien Wains
a4974ccaa3 Fix mine.get compound example
os was missing the grain prefix
2017-05-15 13:56:55 +02:00
Adam Mendlik
c68df1580c Fix typos in comment blocks 2017-05-14 17:27:19 -06:00
Jille Timmermans
fa1a8c19fe Fix indentation from 74728422b2 2017-05-13 19:47:22 +01:00
Jille Timmermans
74728422b2 Add support for ssh certificates to salt.modules.ssh.host_keys
This fixes the bug that ssh.host_keys non-deterministically returns either the
public key or the certificate.
It also adds a parameter like `private` to ignore certificates.
2017-05-13 18:00:07 +01:00
Nicole Thomas
97baddaa10 Merge pull request #41224 from rallytime/probot-stale-config
Add probot-stale config file for the salt repo
2017-05-12 18:17:23 -06:00
Nicole Thomas
726c2a5346 Merge pull request #41222 from rallytime/merge-develop
[develop] Merge forward from nitrogen to develop
2017-05-12 18:14:10 -06:00
Seth House
f1dc63f16c Add performance expectations and recommendations to rest_cherrypy docs 2017-05-12 17:57:32 -06:00
Nicole Thomas
2b533540fd Merge pull request #41221 from rallytime/bp-41211
Back-port #41211 to nitrogen
2017-05-12 17:48:23 -06:00
rallytime
79f1bb2bba Remove unused/duplicate imports leftover from merge-conflict resolution 2017-05-12 17:47:18 -06:00
rallytime
3e75628f87 Add probot-stale config file for the salt repo
This config file enables the [probot-stale](https://github.com/probot/stale/)
bot to comment on stale issues. We're starting off with issues
that have become stale after approximately 3 years and 6 months.
This value is configured in the `daysUntilStale` setting.
2017-05-12 17:31:39 -06:00
rallytime
c8bfb1713f Merge branch '2016.11' into 'nitrogen'
Conflicts:
  - salt/modules/elasticsearch.py
  - salt/states/chocolatey.py
  - salt/utils/gitfs.py
2017-05-12 17:05:20 -06:00
rallytime
d75a7e0d0f Merge branch 'nitrogen' into 'develop'
No conflicts.
2017-05-12 16:42:54 -06:00