Commit Graph

80969 Commits

Author SHA1 Message Date
Thor K. H
b78fc46b91 Fixes #40658: clearer version handling
A few minor improvements/fixes to the clarity of version handling from
both the states view, and the module.

Firstly, the main culprit: the module's check for the passed version
parameter was too strict, and would only work when the version was
explicitly True. This would never work for a string.
This has been changed to simply check if it's "true"-ish: if no
parameter is passed, the default is True, and it'll try to guess a
version number. If you pass a specific version, then it'll use that.

Should you pass False, or an empty string, it'll be viewed as blank,
which was the initial intent. It's not that *that* didn't work, it's
just that the other part didn't, which means no version at all did.
*cough*

Besides that, it's a bit clearer with different default named parameter
values for 'version', that doesn't otherwise change the behaviour in any
reasonable backwards way. A blank version for a Tomcat version is
nonsensical, per Apache's documentation.
https://tomcat.apache.org/tomcat-8.0-doc/config/context.html#Naming

Otherwise, it's all minor with an actual type checker before sending it
along in the module.

Plus, there was a minor mistake in the documentation for the state.
2017-04-13 23:06:20 +01:00
Jim Adson
e5a3a7d217 Fixes bug that prevents syslog returner from working under Python 2.6
Fixes #40688
2017-04-13 15:33:54 -06:00
Mike Place
3cd9a50b22 Merge pull request #40686 from twangboy/fix_service
Fix 'salt-minion' service for Win 10 Creators Update 1703
2017-04-13 14:00:12 -06:00
Mike Place
10f60c2742 Merge pull request #40664 from gtmanfred/develop
wake on lan match with grains cache
2017-04-13 13:59:19 -06:00
Mike Place
ad4d6839fd Merge pull request #40675 from gtmanfred/2016.11
use loader for getting war version
2017-04-13 13:58:30 -06:00
Mike Place
7ea526f59e Merge pull request #40680 from rallytime/bp-40598
Back-port #40598 to 2016.11
2017-04-13 13:58:16 -06:00
Mike Place
dccc789a7e Merge pull request #40683 from gtmanfred/nitrogen
make a list of kwargs keys
2017-04-13 13:57:15 -06:00
twangboy
b6ac4aa86d Fix service for win10 update 2017-04-13 13:51:15 -06:00
rallytime
e440d2e8af Use self.setGrains as context manager in grains test 2017-04-13 13:39:11 -06:00
Mike Place
db68df23dd Merge pull request #40681 from cachedout/status_beacon
Allow status beacon to run on all operating systems
2017-04-13 13:33:10 -06:00
Nicole Thomas
39dd6e284d Merge pull request #40678 from Ch3LL/fix_mac_fstype
fix test_fstype test for mac
2017-04-13 13:20:31 -06:00
Nicole Thomas
88f514835d Merge pull request #40677 from rallytime/merge-develop
[develop] Merge forward from nitrogen to develop
2017-04-13 13:19:07 -06:00
Daniel Wallace
b1da5ab873 wake on lan match with grains cache 2017-04-13 12:57:22 -06:00
rallytime
3d6c983c69 Remove unused import for lint 2017-04-13 11:52:20 -06:00
Daniel Wallace
a61fc824c4 use loader for war extraction
Also set the version added in the docs
2017-04-13 11:51:22 -06:00
Mike Place
cc1643eb1f Fix netapi lint 2017-04-13 11:40:27 -06:00
Mike Place
cfc282f036 Merge pull request #40684 from cachedout/fix_netapi_lint
Fix netapi lint
2017-04-13 11:34:12 -06:00
rallytime
ae034a1d67 Pylint fix 2017-04-13 11:33:47 -06:00
Mike Place
54b5415ddd
Fix netapi lint 2017-04-13 11:33:12 -06:00
Daniel Wallace
f6761e6025 make a list of kwargs keys
kwargs changes size in the for loop, so we need to instantiate a new list of
keys for the kwargs

Fixes #40682
2017-04-13 11:14:51 -06:00
Mike Place
ecbb0d186f
Allow status beacon to run on all operating systems 2017-04-13 10:32:25 -06:00
Christian McHugh
e790930f5a re-add batch support to cherrypy saltapi 2017-04-13 10:19:48 -06:00
Christian McHugh
6eec04b2db pop out of kwargs 2017-04-13 10:19:48 -06:00
Christian McHugh
260dd84758 Create eauth dict for passing into batch class 2017-04-13 10:19:48 -06:00
Christian McHugh
5fb8190d44 Ensure batch uses passed eauth token or credentials 2017-04-13 10:19:48 -06:00
rallytime
17efc7341c Merge branch '2016.11' into 'nitrogen'
Conflicts:
  - salt/modules/win_wua.py
  - salt/netapi/rest_cherrypy/app.py
  - salt/version.py
  - tests/unit/states/grains_test.py
  - tests/unit/states/test_archive.py
2017-04-13 10:14:51 -06:00
Ch3LL
60724980ec
fix test_fstype test for mac 2017-04-13 12:04:20 -04:00
Mike Place
5668cc39de Merge pull request #39802 from cachedout/random_startup_delay
A random startup delay option for minions
2017-04-13 09:53:06 -06:00
rallytime
5282ea2480 Merge branch 'nitrogen' into 'develop'
No conflicts.
2017-04-13 09:46:05 -06:00
Mike Place
49d7124fe5 Merge pull request #40598 from mchugh19/batch_eauth
Ensure batch uses passed eauth token or credentials
2017-04-13 09:44:45 -06:00
Mike Place
4690633e0f Merge pull request #40659 from gtmanfred/ssh
encode for py3
2017-04-13 09:40:59 -06:00
Mike Place
14a5b43216 Merge pull request #40674 from Juniper/nitrogen
new functions for junos modules (lock, unlock, load, commit_check) and changes to install_config
2017-04-13 09:36:03 -06:00
rajvidhimar
060974f9b7 Fix doc for junos install_config in state module 2017-04-13 15:35:13 +05:30
rajvidhimar
50a4f94ec0 Add new functions in junos (lock, unlock, load, commit_check) and doc changes 2017-04-13 15:35:13 +05:30
Nicole Thomas
c4d06c8f01 Merge pull request #40647 from The-Loeki/patch-1
cache roster doc fixes
2017-04-12 16:33:41 -06:00
Daniel Wallace
bfc34d4825 encode for py3
Fixes #40434
2017-04-12 15:32:07 -06:00
Mike Place
d0dc66e40f Merge pull request #40669 from cachedout/fix_develop_lint
Fix develop lint error
2017-04-12 15:26:44 -06:00
Mike Place
e387767647
Fix develop lint error 2017-04-12 15:25:57 -06:00
Mike Place
8912cadcbc Remove whitespace 2017-04-12 15:14:56 -06:00
Christian McHugh
ee66c7ca38 re-add batch support to cherrypy saltapi 2017-04-12 22:07:15 +01:00
Mike Place
6df76f6687 Merge pull request #40665 from rallytime/bp-35665
Back-port #35665 to 2016.11
2017-04-12 15:06:36 -06:00
Mike Place
3e41a248a5 Merge pull request #40666 from gtmanfred/userdata
make sure userdata is always defined in ec2
2017-04-12 15:05:59 -06:00
Daniel Wallace
5e92fd0948 make sure userdata is always defined in ec2 2017-04-12 13:48:49 -06:00
Mike Place
b245abbea5 Merge pull request #40662 from twangboy/backport_msi_versioning
Backport msi-conformant-version function
2017-04-12 12:49:22 -06:00
Mike Place
92b5f03beb Merge pull request #40551 from terminalmage/issue39868
Fix four issues in archive.extracted state
2017-04-12 12:37:51 -06:00
Scott Thrasher
0f897b2426 Switch from comprehension to logic used in jobs runner. This makes it
easier to deal with potential unicode in returns.
2017-04-12 12:35:22 -06:00
Scott Thrasher
78dd629f09 Fix compat issues with /jobs return values.
* ensure that both the return and info keys are lists.
* When the Result key doesn't match the expected shape,
  return an empty list of an empty dict (this matches existing
  behavior when looking for a non-existant JID).
2017-04-12 12:35:22 -06:00
Scott Thrasher
4778bc7365 Speed up /jobs for salt-api when run under cherrypy.
Currently, if a jid is supplied, two runners are run (both
jobs.lookup_jid and jobs.list_job). This is unnecessary because
the return from jobs.list_job contains all of the information
from jobs.lookup_jid as well.

This change runs only jobs.list_job in this case and builds an
appropriate return from the output, netting an ~ 40% decrease
in response time for this endpoint when a jid is supplied.
2017-04-12 12:35:22 -06:00
twangboy
825832812b Backport msi-conformant-version function 2017-04-12 12:00:57 -06:00
Ronald van Zantvoort
4143b050b3 cache roster: better docfixes 2017-04-12 19:46:55 +02:00