Commit Graph

67404 Commits

Author SHA1 Message Date
Nicole Thomas
395b7ad747 Merge pull request #32870 from rallytime/merge-2016.3
[2016.3] Merge forward from 2015.8 to 2016.3
2016-04-26 14:01:44 -06:00
Nicole Thomas
c49495a410 Merge pull request #32872 from whiteinge/batch-orch-docs
Batch orch docs
2016-04-26 13:25:30 -06:00
Seth House
e6540383a7 Document the batch kwarg added in #26355 2016-04-26 13:02:32 -06:00
Seth House
bf1f357bee Fix incorrect code sample bat -> batch 2016-04-26 12:40:45 -06:00
rallytime
e7a11cbe87 Pylint fix 2016-04-26 12:30:50 -06:00
rallytime
80fcdfb9d8 Merge branch '2015.8' into '2016.3'
Conflicts:
  - doc/topics/targeting/grains.rst
  - salt/cli/daemons.py
  - salt/exceptions.py
  - salt/minion.py
  - salt/modules/schedule.py
  - salt/scripts.py
  - salt/states/archive.py
2016-04-26 12:07:42 -06:00
Nicole Thomas
02c681311f Merge pull request #32844 from rallytime/merge-2015.8
[2015.8] Merge forward from 2015.5 to 2015.8
2016-04-26 11:38:08 -06:00
Justin Findlay
5a4398a746 netapi.rest_cherrypy: use unsalted PW on MacOS (#32850) 2016-04-26 11:04:25 -06:00
Nicole Thomas
eb8fb6b9df Back-port #31139 to 2015.8 (#32868)
* Evaluate %h and %u before deciding if the ssh config path is absolute

Since %h is the user's home directory, it's not very useful unless it
appears at the beginning of the path.  However, putting it at the
beginning of the path does not have the expected effect: %h/.ssh
will become /home/someuser/home/someuser/.ssh, since "%h/.ssh" is
identified by Python as a non-absolute path, causing the user's
home directory to be tacked on the front.

* Improved ssh_auth path expansion test
2016-04-26 10:44:01 -06:00
rallytime
1fc9de1d04 Add 'file.source_list' mock to archive state unit tests 2016-04-26 10:39:43 -06:00
Justin Findlay
aac1ae35c5 fix some shell tests for MacOS (#32852)
* auth.pam int test: use unhashed pw for MacOS

* shell tests: strip whitespace from shell return

Similar to 2f1c0cf.

* modules.mac_user.delete: update example for int test

integration.shell.call.CallTest.test_user_delete_kw_output expects this
exact string to be in the doc for user.delete:
```
salt '*' user.delete name remove=True force=True
```
2016-04-26 09:47:35 -06:00
lomeroe
2bd2bd1bbb backport #32732 to 2016.3 (#32851) 2016-04-26 08:40:24 -06:00
lomeroe
4bb5545cb4 backport PR #32732 for issue #23714 (#32847) 2016-04-26 08:39:35 -06:00
Nicole Thomas
5ea003b387 Add pyvmomi version warning to Getting Started with VMware docs (#32845)
Fixes #32824
2016-04-25 16:46:51 -06:00
Justin Findlay
c93b551e9c fix lint for mac modules (#32842)
* modules.mac_keychain: remove unnecessary space in docstrings

* modules.mac_keychain.get_hash: add example to docstring

* modules.mac_user: protect sdecode from loader as _sdecode

* modules.proxy: add missing examples to docstrings
2016-04-25 15:48:56 -06:00
rallytime
9064d3bbfb Merge branch '2015.5' into '2015.8'
Conflicts:
  - salt/cloud/clouds/vmware.py
  - salt/modules/file.py
  - salt/states/archive.py
2016-04-25 15:45:17 -06:00
Justin Findlay
2e80d71a8c add FreeBSD instructions to RC doc (#32783) 2016-04-25 15:26:45 -06:00
Nicole Thomas
f9ffcb697a [2016.3] Merge forward from 2015.8 to 2016.3 (#32784)
* json encode arguments passed to an execution module function call

this fixes problems where you could pass a string to a module function,
which thanks to the yaml decoder which is used when parsing command line
arguments could change its type entirely. for example:

__salt__['test.echo')('{foo: bar}')

the test.echo function just returns the argument it's given. however,
because it's being called through a salt-call process like this:

salt-call --local test.echo {foo: bar}

salt thinks it's yaml and therefore yaml decodes it. the return value
from the test.echo call above is therefore a dict, not a string.

* Prevent crash if pygit2 package is requesting re-compilation of the e… (#32652)

* Prevent crash if pygit2 package is requesting re-compilation of the entire library on production systems (no *devel packages)

* Fix PEP8: move imports to the top of the file

* Move logger up

* Add log error message in case if exception is not an ImportError

* align OS grains from older SLES with current one (#32649)

* Fixing critical bug to remove only the specified Host instead of the entire Host cluster (#32640)

* yumpkg: Ignore epoch in version comparison for explict versions without an epoch (#32563)

* yumpkg: Ignore epoch in version comparison for explict versions without an epoch

Also properly handle comparisions for packages with multiple versions.

Resolves #32229

* Don't attempt downgrade for kernel and its subpackages

Multiple versions are supported since their paths do not conflict.

* Lower log level for pillar cache (#32655)

This shouldn't show up on salt-call runs

* Don't access deprecated Exception.message attribute. (#32556)

* Don't access deprecated Exception.message attribute.

To avoid a deprecation warning message in logs.
There is a new function salt.exceptions.get_error_message(e) instead.

* Fixed module docs test.

* Fix for issue 32523 (#32672)

* Fix routes for redhat < 6

* Handle a couple of arguments better (Azure) (#32683)

* backporting a fix from develop where the use of splay would result in seconds=0 in the schedule.list when there was no seconds specified in the origina schedule

* Handle when beacon not configured and we try to enable/disable them (#32692)

* Handle the situation when the beacon is not configured and we try to disable it

* a couple more missing returns in the enable & disable

* Check dependencies type before appling str operations (#32693)

* Update external auth documentation to list supported matcher. (#32733)

Thanks to #31598, all matchers are supported for eauth configuration.
But we still have no way to use compound matchers in eauth configuration.
Update the documentation to explicitly express this limitation.

* modules.win_dacl: consistent case of dacl constants (#32720)

* Document pillar cache options (#32643)

* Add note about Pillar data cache requirement for Pillar targeting method

* Add `saltutil.refresh_pillar` function to the scheduled Minion jobs

* Minor fixes in docs

* Add note about relations between `pillar_cache` option and Pillar Targeting
to Master config comments with small reformatting

* Document Pillar Cache Options for Salt Master

* Document Minions Targeting with Mine

* Remove `saltutil.refresh_pillar` scheduled persistent job

* Properly handle minion failback failure. (#32749)

* Properly handle minion failback failure.

Initiate minion restart if all masters down on __master_disconnect like
minion does on the initial master connect on start.

* Fixed unit test

* Improve documentation on pygit2 versions (#32779)

This adds an explanation of the python-cffi dep added in pygit2 0.21.0,
and recommends 0.20.3 for LTS distros. It also links to the salt-pack
issue which tracks the progress of adding pygit2 to our Debian and
Ubuntu repositories.

* Pylint fix
2016-04-25 15:26:09 -06:00
Nicole Thomas
44f08d01e6 Pass None as memory limit. (#32841)
Fixes: #25492
2016-04-25 15:24:24 -06:00
Nicole Thomas
7141119ff6 add a tutorial around moving logic from maps.jinja to an execution module (#32840) 2016-04-25 15:24:12 -06:00
Nicole Thomas
feebe691ce Back-port #32813 to 2015.8 (#32839)
* Add comments as an option for apt in pkgrepo.managed.

Added comments as an option when setting an ap repo file.

* Update versionadded for backport
2016-04-25 15:23:59 -06:00
Knut Auvor Grythe
478856815c Support unicode in all GECOS fields on FreeBSD (#32794)
* Support unicode in all GECOS fields on FreeBSD

* Revert erroneous change

* Add unit tests
2016-04-25 15:19:13 -06:00
Nicole Thomas
b92e19472f Fix comment about minion_id_caching (#32838) 2016-04-25 14:56:40 -06:00
Andreas Lutro
3b81031d5b various improvements on cloud deploy script docs (#32659) 2016-04-25 14:00:24 -06:00
Justin Findlay
1bce58eb73 update bootstrap to 2016.04.18 release (#32669) 2016-04-25 13:55:15 -06:00
Justin Findlay
9b5c14c37c salt-cloud -u downloads stable version from bootstrap.saltstack.com by default (#32837)
* salt-cloud -u downloads stable version

* utils.cloud.update_bootstrap: minor edits of docstring
2016-04-25 13:53:54 -06:00
Alejandro Bednarik
22e662f024 Small fixes for pip and virtualenv modules. (#32637)
Replaced a stack error with a well formatted message when virtualenv
binary is not present.
Also in pip module the was a mix of references to the logging object.
Changed all to logger since long is a variable that refers to pip log.

dummy
2016-04-25 11:45:29 -06:00
Shane Lee
25df973d4c Added pycurl to windows dependencies (#32731) 2016-04-25 11:13:10 -06:00
Justin Findlay
9725804448 update bootstrap to 2016.04.18 release (#32667) 2016-04-25 11:10:41 -06:00
Justin Findlay
bf85987d7c update bootstrap to 2016.04.18 release (#32668) 2016-04-25 11:10:28 -06:00
Shane Lee
8de1c6c094 Add debugging options to mac service configs (#32789) 2016-04-25 11:06:30 -06:00
Nicole Thomas
83dee6366c Back-port #29322 to 2015.8 (#32785)
* add http proxy support for tornado

* add proxy_username/password and doc for the minion

* add pycurl deps for tornado

* fix lint issues

* remove hard coded requirements for pycurl, change curl_httpclient to be optional unless proxy_host/port is set

* fix lint
2016-04-25 10:46:37 -06:00
Shane Lee
c657f3d829 Remove additional unneeded files and dirs (#32790) 2016-04-25 09:23:47 -06:00
Nicole Thomas
96a3d4e556 Merge pull request #32787 from rallytime/bp-32722
Back-port #32722 to 2015.8
2016-04-25 09:19:21 -06:00
Nicole Thomas
36f70f5847 Merge pull request #32786 from rallytime/bp-32703
Back-port #32703 to 2015.8
2016-04-25 09:19:13 -06:00
Nicole Thomas
c842e1e437 Merge pull request #32776 from rallytime/merge-2015.5
[2015.5] Merge forward from 2014.7 to 2015.5
2016-04-25 09:18:12 -06:00
Nicole Thomas
7ecbf9f885 Merge pull request #14 from whiteinge/runner-async-low
Format low data correct for runner_async
2016-04-22 14:57:45 -06:00
Seth House
211f7b4af1 Format low data correct for runner_async 2016-04-22 14:36:41 -06:00
Brad Thurber
8d7148d41b Catch up the conf/master file to include gitfs/git_pillar parms from recent releases 2016-04-22 13:34:21 -06:00
Shammah Chancellor
baa4df25c9 Make example top file match templated version
Currently the example top file under "Matching Grains in the Top File" has
node_type grains whose values do not match the names of the states which
they specify.  (e.g. the `webserver` node_type specifies the `web` state).  
Later these values are templated using jinja templates as if they are identical.

This commit adjusts the values in the example to be identical, so that the 
template example follows naturally.
2016-04-22 13:32:56 -06:00
Erik Johnson
a6a4274021 Merge branch 'pr-32775' into 2015.8 2016-04-22 14:05:32 -05:00
Erik Johnson
227ef4aabb Fix unnecessary capitalization 2016-04-22 14:05:03 -05:00
Erik Johnson
73cd9f26c3 Merge branch 'gitfs_perremote_doc_updates' of https://github.com/l2ol33rt/salt into pr-32775 2016-04-22 14:04:18 -05:00
Erik Johnson
cda00f4f93 Improve documentation on pygit2 versions (#32779)
This adds an explanation of the python-cffi dep added in pygit2 0.21.0,
and recommends 0.20.3 for LTS distros. It also links to the salt-pack
issue which tracks the progress of adding pygit2 to our Debian and
Ubuntu repositories.
2016-04-22 12:47:57 -06:00
rallytime
ce72851861 Merge branch '2014.7' into '2015.5'
Conflicts:
  - salt/netapi/rest_tornado/__init__.py
  - salt/netapi/rest_tornado/saltnado.py
2016-04-22 10:24:06 -06:00
Seth House
2775edc176 Saltnado /run fix (#32590)
* Revert "Verify auth in saltnado run (#32552)"

This reverts commit b19c5a5ce7.

* Call runner.cmd_async instead to enforce eauth

* Check for both token or user/pass before giving to Salt

* Remove comment as we're now enforcing auth here

* Lint and functionality fix courtesy of Mike P.

* Don't fail the whole request if there's an eauth problem
2016-04-22 10:10:47 -06:00
Robert James Hernandez
b69d406ada Including name per-remote config option in example 2016-04-22 09:07:10 -07:00
Alejandro Bednarik
66ba35261c Archive extracted perms update. (#32765)
As described in #32753 archived.extracted chnages more permissions that they
should. Since if_missing is None, name is assigned to this variable, this
chnage will help not updating files/dirs permissions outside the actual extracted file.
2016-04-22 09:17:11 -06:00
Dmitry Kuzmenko
1d6d234417 Properly handle minion failback failure. (#32749)
* Properly handle minion failback failure.

Initiate minion restart if all masters down on __master_disconnect like
minion does on the initial master connect on start.

* Fixed unit test
2016-04-22 09:15:55 -06:00
Daniel Wallace
ef5305a23b Allow for specifying not using the random module (#32763)
The Random module can lead to non alpha numeric characters in the
password.  Since we also use this for creating the salt, some devices
cannot have these extra characters in their salts, so allow to turn this
feature off as needed.
2016-04-22 09:05:53 -06:00