Commit Graph

76022 Commits

Author SHA1 Message Date
Mike Place
6365211a6f Merge pull request #39291 from terminalmage/pillar-docs
Add note about using saltenv jinja var in pillar top files
2017-02-09 14:43:49 -07:00
Mike Place
77e50ed8b7 Merge pull request #39286 from terminalmage/fix-pillarenv-precedence
Allow minion/CLI saltenv/pillarenv to override master when compiling pillar
2017-02-09 14:22:45 -07:00
Erik Johnson
fbd551e069 Add note about using saltenv jinja var in pillar top files
This adds some useful information to the pillar docs.
2017-02-09 14:39:09 -06:00
Sergei Zviagintsev
1d4c1dc140 Whitespace fix in docs Makefile
Remove extra empty line
2017-02-09 19:19:09 +01:00
Sergei Zviagintsev
04bde6eed2 Fix link in proxyminion guide 2017-02-09 19:18:13 +01:00
Sergei Zviagintsev
5d9f36d58d Fix typo
manor -> manner
2017-02-09 19:16:08 +01:00
Sergei Zviagintsev
70f2b586d3 Rewrap paragraph
Rewrap the paragraph to fit in 80 chars line. The contents isn't
changed.
2017-02-09 19:13:01 +01:00
Mike Place
52440416ca Merge pull request #39221 from lvg01/fix-bug-39220
Fix bug 39220
2017-02-09 11:12:28 -07:00
Erik Johnson
3cb9833e57 Allow minion/CLI saltenv/pillarenv to override master when compiling pillar
Because we check in the master opts first, if the environment or
pillarenv values are set in the master config file, they will take
precedence over the values specified in the minion config (or gathered
via the CLI). This commit fixes that ordering such that the values
passed to __gen_opts() take precedence over the values from the master
config.
2017-02-09 12:04:11 -06:00
Sergei Zviagintsev
e6ab5178ea Grammar fix
Use 'if' instead of 'in case'
2017-02-09 19:02:29 +01:00
Mike Place
a496ec2a16 Merge pull request #39281 from twangboy/win_installer
Require VCRedist on 2008R2 and below instead of 2008
2017-02-09 10:59:56 -07:00
Erik Johnson
5a27207c57 Add warning for Dulwich removal (#39280)
Dulwich support is being removed for the Oxygen release (see #39210).
2017-02-09 10:33:20 -07:00
Nicole Thomas
db6140aa83 Merge pull request #39264 from rallytime/merge-2016.11
[2016.11] Merge forward from 2016.3 to 2016.11
2017-02-09 10:10:13 -07:00
Mike Place
304eb19b18 Merge pull request #39276 from gtmanfred/2016.11
_device_mismatch_ignored will never be True
2017-02-09 10:05:27 -07:00
twangboy
ef5078729a Capitalize the 'r' for 2008R2 2017-02-09 09:55:59 -07:00
twangboy
1b6bd634ac Require VCRedist on 2008R2 and below instead of 2008 2017-02-09 09:47:47 -07:00
rallytime
a9c2c106c1 Pylint fix 2017-02-09 08:50:56 -07:00
Daniel Wallace
6635a9fd3b _device_mismatch_ignored will never be True
It will be the name of the device that has matched the regex
2017-02-09 09:45:24 -06:00
rallytime
f6aad99db2 Merge branch '2016.3' into '2016.11'
Conflicts:
  - salt/loader.py
  - salt/output/highstate.py
  - salt/runners/fileserver.py
2017-02-08 16:57:54 -07:00
Erik Johnson
1b9217d636 Update jsonschema tests to reflect change in jsonschema 2.6.0 (#39260)
Version 2.6.0 changed the wording of one of the exceptions tested,
causing tests to fail when jsonschema 2.6.0 is installed. This commit
updates the tests to change the assert for 2.6.0 and later.
2017-02-08 16:51:56 -07:00
Mike Place
7611698474 Merge pull request #39238 from dmurphy18/fix_aix_disk_mount
Update disk fstype, inodeusage, percent and mount.active functions for AIX support
2017-02-08 14:53:31 -07:00
Erik Johnson
c1d16cc3d0 Better handling of enabled/disabled arguments in pkgrepo.managed (#39251)
This reverses the decision made in #35055 to deprecate the "enabled"
parameter in this state. This was a poorly-conceived decision, likely
made because the "enabled" param was not included in the docstring for
the pkgrepo.managed state under the "YUM/ZYPPER" section, while the
"disabled" param *was* listed under the "APT" section.

"disabled" isn't a thing in yum/dnf, so there was never any reason to
try to shoehorn it in. Not to mention the fact that the "disabled"
argument isn't even supported in Zypper, which effectively breaks Zypper
support.

This commit normalizes enabled/disabled based on platform, so passing
"enabled" in APT will pass the opposite value as "disabled", and
vice-versa on the other platforms. This allows enabled/disabled to be
used interchangeably.

It also more gracefully handles booleans in yum/dnf/zypper, so that a
bool can be properly compared to a 1/0 value.
2017-02-08 14:52:45 -07:00
David Murphy
a8a519c493 Removed space for pylint 2017-02-08 12:42:14 -07:00
Mike Place
8e88f71dd9 Merge pull request #39227 from terminalmage/loader-optimization
Loader optimzation
2017-02-08 12:38:21 -07:00
David Murphy
8fa0ffa427 Updates due to code review comments 2017-02-08 12:38:14 -07:00
David Murphy
97c59a8d1c Updated mount functionality for active on AIX 2017-02-08 12:38:14 -07:00
David Murphy
1a32b2cc89 Updated disk functionality for fstype, inodeuage and percent on AIX 2017-02-08 12:38:14 -07:00
Mike Place
bc89b297f8 Merge pull request #39228 from gtmanfred/2016.3
default to utf8 encoding if not specified
2017-02-08 12:36:57 -07:00
Mike Place
d9b0671dbd Merge pull request #39231 from terminalmage/clarify-jenkins-depends
Add clarification for jenkins execution module
2017-02-08 12:34:45 -07:00
Mike Place
ddcff89a84 Merge pull request #39232 from terminalmage/issue21342
Avoid recursion in s3/svn ext_pillars
2017-02-08 12:33:27 -07:00
Mike Place
99bfa7dfee Merge pull request #39233 from rallytime/fixup-more-doc-build-warnings
Various doc updates to fix warnings in doc build
2017-02-08 12:29:53 -07:00
Mike Place
59e927b520 Merge pull request #39237 from axmetishe/2016.11
fix rds subnet group creation
2017-02-08 12:04:30 -07:00
Evgeny Akhmetkhanov
6f4be8b69c fix rds subnet group creation 2017-02-07 15:46:31 -08:00
Nicole Thomas
84ff63875c [2016.11] Merge forward from 2016.3 to 2016.11 (#39234)
* Fix for #38697

* Lint fixes

* Added missing source_hash_name argument in get_managed function
Additional fix to  #33187
Customer was still seeing errors, this should now work.
Tested with 2015.8.13 and 2016.11.2

* [2016.3] Pylint fix (#39202)

* Ignore empty dicts in highstate outputter

Closes #37174

* Sort the return list from the fileserver.envs runner

* Fix the win_ip_test failures (#39230)

The changes made in #38793 changes the "get_all_ointerfaces" call
to be a list of DNS servers. This change adjusts the tests structure
from a string to a list and fixes the test failure.
2017-02-07 16:06:56 -07:00
Nicole Thomas
ef4e437bbc Fix the win_ip_test failures (#39230)
The changes made in #38793 changes the "get_all_ointerfaces" call
to be a list of DNS servers. This change adjusts the tests structure
from a string to a list and fixes the test failure.
2017-02-07 14:53:59 -07:00
Erik Johnson
c88896c277 Avoid recursion in s3/svn ext_pillars
This passes ``ext=False`` when compiling pillar data in these ext_pillar
sources.
2017-02-07 15:38:53 -06:00
Erik Johnson
ad1b1255f2 Add clarification for jenkins execution module
There are two modules on PyPI which import as "jenkins". Installing the
wrong one will result in a traceback when the execution module tries to
use the Python bindings. This commit adds information about the
dependency to the docstring for the module. It also checks to make sure
that jenkins.Jenkins is present in the __virtual__() func, and if not it
will fail to load the execution module with a meaningful error message
in the log.
2017-02-07 15:03:11 -06:00
Daniel Wallace
afee047b08 default to utf8 encoding if not specified
On errors, for some reason AWS does not always have an encoding on the
message.  Default to 'utf-8'.
2017-02-07 14:28:03 -06:00
Erik Johnson
c750662946 Loader optimzation
Use a str.join instead of str.format to make the full function name.
2017-02-07 13:50:41 -06:00
Erik Johnson
fd3284f0c7 Put legacy git_pillar on a deprecation path for Oxygen (#39225)
This adds a warning when legacy git_pillar is used, and a notice in the
docs.
2017-02-07 11:18:28 -07:00
Mike Place
19c3d90a32 Merge pull request #39180 from morganwillcock/setup
setup.py: Remove global options from install command
2017-02-07 09:20:48 -07:00
Mike Place
df5f934c34 Merge pull request #39199 from rallytime/bp-39170
Back-port #39170 to 2016.3
2017-02-07 09:19:31 -07:00
Mike Place
2621c119fd Merge pull request #39206 from cachedout/issue_issue_37174
Ignore empty dicts in highstate outputter
2017-02-07 09:11:35 -07:00
Mike Place
dd440452ea Merge pull request #39209 from terminalmage/sorted-envs
Sort the return list from the fileserver.envs runner
2017-02-07 09:07:08 -07:00
C. R. Oldham
a0907bc861 Merge pull request #38863 from hujunya/fix_django_auth
fix django auth not work
2017-02-07 09:42:59 -06:00
Luitzen van Gorkum
e8a41d6341 Removes to early content stripping (stripping is allready done when needed with ident:true), fixes #39220 2017-02-07 15:14:52 +01:00
Luitzen van Gorkum
a4b169e0bd Fixed wrong logic, fixes #39220 2017-02-07 15:14:18 +01:00
Junya Hu
2a99ff46d3 check if django_auth_path has been in sys.path 2017-02-07 15:08:51 +08:00
Erik Johnson
e6dda4a625 Sort the return list from the fileserver.envs runner 2017-02-06 21:30:13 -06:00
rallytime
2f74dcf685 Various doc updates to fix warnings in doc build 2017-02-06 16:56:58 -07:00