Commit Graph

61760 Commits

Author SHA1 Message Date
Bo Maryniuk
cb40618262 Fire an event about released Zypper with its result 2016-04-27 10:04:32 +02:00
Bo Maryniuk
0728f0bc00 Replace string values with the constants 2016-04-27 10:04:15 +02:00
Erik Johnson
b307c5452a Fix incorrect deprecation notice
The "deprecated" entry refers to when the deprecation path started, not
when the option will be removed.
2016-04-26 23:52:08 -05:00
jacobhammons
a2921b9da0 Merge pull request #32878 from jacobhammons/salt-cloud
added note about updating the bootstrap script in salt-cloud using th…
2016-04-26 15:09:51 -06:00
Jacob Hammons
3887938727 added note about updating the bootstrap script in salt-cloud using the -u flag, removed the saltconf banner. 2016-04-26 15:08:59 -06:00
Nicole Thomas
71db10fd2c Merge pull request #32869 from rallytime/fix-32861
Use correct config setting in cloud syndic docs
2016-04-26 13:13:21 -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
rallytime
0e73daa126 Use correct config setting in cloud syndic docs
Fixes #32861
2016-04-26 11:32:01 -06:00
Bo Maryniuk
6af3f7141b Check if zypper lock exists and add more debug logging 2016-04-26 19:13:38 +02:00
Bo Maryniuk
0167b30a75 Add Zypper lock constant 2016-04-26 19:13:01 +02:00
Bo Maryniuk
370ff21d36 Fire an event to the Master about blocked Zypper. 2016-04-26 19:06:46 +02: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
Bo Maryniuk
1727ca3de2 Use new Zypper call implementation 2016-04-26 18:03:34 +02:00
Bo Maryniuk
485164aa5c Remove blocking-prone Zypper call implementation 2016-04-26 18:02:53 +02:00
Bo Maryniuk
f161f0612c Implement block-proof Zypper call implementation 2016-04-26 18:02:17 +02:00
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