Commit Graph

78823 Commits

Author SHA1 Message Date
rallytime
ddf8f87249 Add some additional mocks for win_iis unit test 2017-02-28 10:36:11 -07:00
rallytime
20dd5593cd Pylint fix 2017-02-27 15:50:32 -07:00
rallytime
b4366103a6 Merge branch '2016.11' into 'develop'
Conflicts:
  - .pylintrc
  - .testing.pylintrc
  - salt/fileclient.py
  - salt/minion.py
  - salt/modules/docker.py
  - salt/modules/win_iis.py
  - salt/states/docker.py
  - salt/states/file.py
  - salt/utils/__init__.py
  - tests/integration/modules/test_sysmod.py
2017-02-27 15:11:37 -07:00
Nicole Thomas
f3fbe7ddd4 Merge pull request #39689 from rallytime/fix-lint
[develop] Clean up pylint failures
2017-02-27 13:03:30 -07:00
rallytime
73d1693557 [develop] Clean up pylint failures 2017-02-27 10:18:58 -07:00
Mike Place
69066f8076 Merge pull request #39686 from cachedout/correct_docs_test
Correct small bug with docs test.
2017-02-27 10:00:27 -07:00
Mike Place
b6dea5efb9
Correct small bug with docs test. 2017-02-27 09:59:25 -07:00
Mike Place
3336dbc02a Merge pull request #39660 from terminalmage/warn_ip_addrs
Add warnings to test suite when requisites are not installed
2017-02-27 09:55:38 -07:00
Mike Place
3c314b781f Merge pull request #39674 from F30/backup-comment
Fix comments about file backup directory
2017-02-27 09:43:45 -07:00
Felix Dreissig
78a185ab11 Fix comments about file backup directory
The actual file state backup directory is called "file_backup" without a
trailing 's'.
2017-02-26 22:49:29 +01:00
Pedro Algarvio
df013c5f31 Merge pull request #39666 from terminalmage/test_valid_docs
Rewrite the test_valid_docs test
2017-02-26 20:14:32 +00:00
Erik Johnson
5a3c099e4f Rewrite the tests_valid_docs test
This uses a function in the runtests_helpers custom module to perform
all the logic, and only returns what failed the test. This saves us from
having to return the entire contents of sys.doc (as well as log all of
the function calls), and also removes the need to run sys.doc in batches
to get around the "max message size" issue.
2017-02-26 12:21:00 -06:00
Mike Place
627b0d1841 Merge pull request #39664 from terminalmage/squelch-warning
Squelch warning for virtual grain
2017-02-25 20:09:41 -07:00
Erik Johnson
130abb1ec8 Merge pull request #39665 from cachedout/solaris_doc_update
Update Solaris installation document
2017-02-25 20:47:03 -06:00
Mike Place
a29a7be7f8 Merge pull request #39662 from The-Loeki/py3cachefix
Py3 compat: Force minions to be a list for local serialized caches
2017-02-25 19:36:46 -07:00
Mike Place
b02ef984f7 Add comment 2017-02-25 19:34:39 -07:00
Mike Place
73588300c1 Merge pull request #39549 from onlyanegg/add_loop_state
Adding loop state
2017-02-25 19:31:01 -07:00
Mike Place
e540b4616e
Update Solaris installation document
The OpenCSW packages are no longer maintained. Include details about
installing via setup.py.
2017-02-25 19:24:02 -07:00
Erik Johnson
a3c20e7d73 Squelch warning for virtual grain
https://github.com/saltstack/salt/pull/39504 fixed what was a legitimate
bug, but in turn this causes this warning to be logged hundreds of times
in the minion log on unprivileged containers.

This commit changes the log level for this message to debug.
2017-02-25 20:07:16 -06:00
Erik Johnson
79a65aa3b4 Add GitPython to dev_python27.txt requirements file 2017-02-25 19:49:44 -06:00
Erik Johnson
503216e5c5 Add warnings to test suite when requisites are not installed
Since we have recently changed the test suite to use new-style
git_pillar, GitPython or Pygit2 is a hard dep for the test suite.

Additionally, when starting up the daemons, if no IPv4 addresses can be
detected (which can happen on docker containers which tend to have
minimal installs) then the suite will time out trying to detect whether
or not the minion/sub-minion has connected, which while it does not
prove fatal for the test suite, it does make the suite take several
minutes to start up and begin running tests. This is because the test
suite invokes the manage.joined runner, which in turn invokes
salt.utils.network.ip_addrs() to get the system's IP addresses to match
against those which are connected. If it can't get the IP addresses,
then the manage.joined runner returns an empty list, and the test suite
believes that no minions have connected, and the function that
periodically runs manage.joined will eventually time out.

This commit adds messages to the console when no suitable gitfs provider
is installed, and when salt.utils.network.ip_addrs() returns an empty
list, to hopefully prompt the user to install the missing requisites.
2017-02-25 19:49:44 -06:00
Ronald van Zantvoort
0fe5c90a05 Py3 compat: Force minions to be a list for local serialized caches 2017-02-26 00:54:40 +01:00
Erik Johnson
5770f28aab Merge pull request #39656 from skizunov/develop2
opkg: Add support for spaces in repo names
2017-02-24 22:19:40 -06:00
Erik Johnson
bd6efd18b1 Merge pull request #39644 from vutny/dockerng-docs
Improve and align dockerng execution module docs
2017-02-24 22:16:28 -06:00
Sergey Kizunov
4dbd7ead82 opkg: Add support for spaces in repo names
Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
2017-02-24 18:13:02 -06:00
Mike Place
e28350ee56 Merge pull request #39650 from terminalmage/issue35803
Handle deprecation of passing string kwargs in the WheelClient/RunnerClient
2017-02-24 17:00:03 -07:00
Mike Place
fffab54078 Merge pull request #39516 from jettero/give-pillarenv-tops-similar-treatment
Prevent spurious "Template does not exist" error
2017-02-24 16:41:35 -07:00
Mike Place
bbdc4b843a Merge pull request #39499 from garethgreenaway/feature-slack-engine-groups
Slack Engine Access Groups
2017-02-24 16:38:11 -07:00
Mike Place
83a631b018 Merge pull request #39527 from YuriGrigorov/feature-39322
Add splay support for all scheduling criteria
2017-02-24 16:37:00 -07:00
Mike Place
cfeda912f6 Merge pull request #39629 from terminalmage/pr-34327
Implement git_pillar mountpoints
2017-02-24 16:30:32 -07:00
Mike Place
aba4c29626 Merge pull request #39632 from terminalmage/issue39570
Implement no_block for service.running/service.dead (systemd only)
2017-02-24 16:25:35 -07:00
Mike Place
be9629b180 Merge pull request #39654 from skizunov/develop2
Fix issue where compile_pillar failure causes minion to exit
2017-02-24 15:47:51 -07:00
Mike Place
e63cbbaab9 Merge pull request #39653 from cachedout/26_odict
Use salt's ordereddict for comparison
2017-02-24 15:46:23 -07:00
Erik Johnson
f6b9152a9e Add no_block feature to Nitrogen release notes 2017-02-24 15:14:09 -06:00
Erik Johnson
28564da966 Implement no_block for service.running/service.dead (systemd only) 2017-02-24 15:14:09 -06:00
Mike Place
9eb23993d3 Merge pull request #39467 from gtmanfred/sls_build
Use sls_build for building docker images
2017-02-24 14:04:38 -07:00
Sergey Kizunov
9f80bbce07 Fix issue where compile_pillar failure causes minion to exit
If there is a failure in `Minion._post_master_init` (for example,
the `compile_pillar` fails) and the `master_type` is `failover`,
then `MinionManager._connect_minion` will catch the exception and then
retry. However, the retry will cause the minion to exit because
`opts['master']` is currently a string and not a list. Fix this
case to enable the retry to not cause the minion to exit.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>

Conflicts:
	salt/minion.py
2017-02-24 15:02:48 -06:00
Mike Place
91eb7210bb
Use salt's ordereddict for comparison
Last thing needed for 2.6 compat
2017-02-24 13:44:54 -07:00
Nicole Thomas
4612a411af Merge pull request #39595 from ni3mm4nd/mongodb-module
Rework MongoDB execution module due to eval deprecation
2017-02-24 13:44:21 -07:00
Erik Johnson
8c26d5adc6 Handle deprecation of passing string kwargs in the WheelClient/RunnerClient
All refs have been checked and confirmed to be passing args/kwargs in
the correct way. This commit removes the deprecation notice and replaces
it with a log message when string kwargs are passed.
2017-02-24 13:40:21 -06:00
Mike Place
0bc6027e68 Merge pull request #39609 from gtmanfred/2016.11
intialize the Client stuff in FSClient
2017-02-24 11:50:54 -07:00
Mike Place
28035c07b3 Merge pull request #39615 from skizunov/develop2
Bonjour/Avahi beacons: Make sure TXT record length is valid
2017-02-24 11:47:04 -07:00
Mike Place
89635b4467 Merge pull request #39593 from zwo-bot/fix-issue-#27160
Fix issue #27160 - escape whitespaces in fstab entry in module mount when persist=True
2017-02-24 11:04:15 -07:00
Mike Place
be27356dad Merge pull request #39618 from twangboy/win_fix_wheel_tests
Fix wheel tests
2017-02-24 11:00:14 -07:00
Daniel Wallace
89101fa342 allow sls_build to be used with states 2017-02-24 11:47:13 -06:00
Nicole Thomas
5fc4c300ed Merge pull request #39645 from rallytime/fix-lint
Add pylint disable to global salt definition
2017-02-24 10:09:57 -07:00
Erik Johnson
9a2193e8f2 Add git_pillar mountpoints feature to Nitrogen release notes 2017-02-24 10:37:28 -06:00
Erik Johnson
a5402eadbd Fix a sentence in the docs that was unfinished 2017-02-24 10:37:28 -06:00
Erik Johnson
d6f50a8529 Add reminder not to disable git_pillar_includes 2017-02-24 10:37:28 -06:00
Erik Johnson
7eb86ac82e Skip processing on mounted git_pillar dirs 2017-02-24 10:37:27 -06:00