Commit Graph

61844 Commits

Author SHA1 Message Date
Bo Maryniuk
baf35ed708 Remove one-char variables 2016-04-26 17:58:26 +02:00
Bo Maryniuk
2c94eb016f Remove an unused variable 2016-04-26 17:57:09 +02:00
Bo Maryniuk
6869ebc557 Remove an empty line 2016-04-26 17:56:47 +02:00
Bo Maryniuk
7e06489da9 Remove verbose wrapping 2016-04-26 17:56:24 +02:00
lomeroe
edce22a143 backport PR #32732 to 2015.5 fixes #23714 (#32848) 2016-04-26 08:39:53 -06:00
lomeroe
4bb5545cb4 backport PR #32732 for issue #23714 (#32847) 2016-04-26 08:39:35 -06:00
Bo Maryniuk
2131ff04af Standarize zypper call to "run_all" 2016-04-26 11:30:10 +02:00
Bo Maryniuk
046ef44ca3 Bugfix: version_cmp crashes in CLI if there are versions, that looks like integer or float. 2016-04-26 11:27:56 +02: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
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
Nicole Thomas
44f08d01e6 Pass None as memory limit. (#32841)
Fixes: #25492
2016-04-25 15:24:24 -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
Andreas Lutro
3b81031d5b various improvements on cloud deploy script docs (#32659) 2016-04-25 14:00:24 -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
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
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
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
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
Denys Havrysh
3751a270d7 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
2016-04-22 08:54:30 -06:00
Bo Maryniuk
b869a92eea Change Zypper calls to a single point 2016-04-22 14:59:14 +02:00
Justin Findlay
35c8af3ece modules.win_dacl: consistent case of dacl constants (#32720) 2016-04-21 08:39:23 -06:00
Erik Johnson
67d0c81184 Support remote sources in a source list (#32691)
* Support remote sources in a source list

This commit modifies the source_list check so that remote sources
(http(s), ftp, etc.) are not fetched more than once. To do so, it
adds the use of ``__context__`` in ``cp.cache_file`` and
``file.source_list`` to prevent multiple fetches of a single file in the
same salt run.

* Update tests

Added __context__ to test cases to reflect usage of __context__, and
also added file.source_list to mocked funcs for archive.extracted unit
test.
2016-04-21 08:37:38 -06:00
Boris Feld
2cd08177be 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.
2016-04-21 08:33:50 -06:00
Joseph Hall
bba089d716 Check dependencies type before appling str operations (#32693) 2016-04-20 13:59:15 -06:00
garethgreenaway
3aa0605033 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
2016-04-20 13:58:51 -06:00
Nicole Thomas
f52af5a596 Merge pull request #32718 from garethgreenaway/2015_8_schedule_list_fix
Fixes to schedule.list in 2015.8
2016-04-20 13:51:24 -06:00
Gareth J. Greenaway
7fa5d809d2 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 2016-04-20 09:05:50 -07:00
Nicole Thomas
bd5442d768 Merge pull request #32686 from cachedout/issue_32661
Fix stacktrace in batch with dup minion ids
2016-04-19 13:18:50 -06:00
Nicole Thomas
f63566e452 Merge pull request #32684 from captaininspiration/2015.8
Fix routes for redhat < 6
2016-04-19 13:18:19 -06:00
Mike Place
f704df90bc Fix stacktrace in batch with dup minion ids
Resolves #32661
2016-04-19 10:39:31 -06:00
Joseph Hall
7cdd5121ef Handle a couple of arguments better (Azure) (#32683) 2016-04-19 10:29:43 -06:00
captaininspiration
640c7a90da Fix routes for redhat < 6 2016-04-19 18:06:11 +02:00
Ryan Larson
aaa03bc6e6 Fix for issue 32523 (#32672) 2016-04-19 07:05:19 -06:00
Colton Myers
3ec9502a86 Update "Low Hanging Fruit" to "Help Wanted" (#32675) 2016-04-19 07:03:46 -06:00
Mike Place
77bea56b68 Additional documentation on calling exec modules from templates (#32657)
Refs #32612
2016-04-18 12:16:00 -06:00
Dmitry Kuzmenko
21081b1e88 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.
2016-04-18 10:51:43 -06:00