Commit Graph

61663 Commits

Author SHA1 Message Date
Shane Lee
4bb3ca5955 Compare uid and gid instead of name and group (#32674)
* Compare uid and gid instead of name and group

* Gate the uid comparison
2016-05-03 09:37:52 -07:00
Nicole Thomas
9ca5b02b0c Allow batch mode to use verbose option, as well as show_jid. (#32996)
Fixes #32856
2016-05-03 09:17:50 -07:00
Adam Tengler
81c0fa4d78 Fixed glusterfs.peered output (#32955)
Fixed 'NoneType' object is not iterable and removed existing peers from newpeers list

Fixes #32954
2016-05-03 08:57:35 -07:00
Nicole Thomas
8c70d7a56b Clarify some arg docs (#32994)
Fixes #26011

Also reorganizes some of the kwarg definitions so it's more
clear what is documented and what docs are missing.
2016-05-03 08:54:28 -07:00
Justin Anderson
00fbeaba5f Fix boto_secgroup_test (#32986) 2016-05-02 10:46:19 -06:00
Jorge Schrauwen
336236750f fix user cron on solarish operating systems (#32970)
* properly set cron entries on Solarish systems

* also fix write_cron_file(_verbose_

* minor tweak to make merging into 2016.3 and develop easier

* per @damon-atkins, be more restrictive with fpopen for the user crontab

* fix another small security hole by swapping fopen to fpopen + mode. fixed previous commit by switching back to 0600
2016-05-02 08:28:51 -07:00
Justin Findlay
07e38bc9be salt.log.setup: process user args before format (#32796)
* salt.log.setup: process user args before format

Before:
    [DEBUG   ] too many %s
After:
    [DEBUG   ] too many secrets

* salt.log.setup: allow SaltLogRecord attrs on console
2016-04-29 10:47:01 -07:00
Justin Findlay
b2d7c81f66 doc.ref.states.ordering: clarify requisite change (#32934) 2016-04-28 15:41:01 -06:00
Nicole Thomas
df41d5dfb1 mode should default to 'text' (#32928) 2016-04-28 14:16:19 -06:00
Nicole Thomas
f581a8218d Remove FileClient class references from docs - it doesn't exist. (#32925)
* Remove FileClient class references from docs - it doesn't exist.

Replace FileClient class references with mentions of the fileclient.py
module and replace code examples with salt.fileclient.get_file_client
examples.

Fixes #32646

* Don't reference minion import when not used
2016-04-28 14:14:40 -06:00
Nicole Thomas
31b96dec7b Update contents_grains option with relevant docs (#32922)
Instead of "works like contents_pillar". Also added grains example.

Fixes #23683
2016-04-28 13:49:07 -06:00
Nicole Thomas
e60c12640d Merge pull request #32926 from rallytime/merge-2015.8
[2015.8] Merge forward from 2015.5 to 2015.8
2016-04-28 13:47:52 -06:00
rallytime
5a184881be Merge branch '2015.5' into '2015.8'
No conflicts.
2016-04-28 12:33:10 -06:00
Megan Wilhite
1cd6a45b8f specify volume tags in profile configuration (#32908) 2016-04-28 10:14:45 -06:00
Nicole Thomas
85ca86de08 Update docs to warn users that -1 isn't valid for iptables insert state (#32906)
Fixes #23953

Also clarifies the append state doc to indicate that rules will
always be added to the end of a chain.
2016-04-28 10:14:28 -06:00
Nicole Thomas
cb68706db2 Allow profile options to be specified in provider file when using maps (#32900)
Fixes #32510
2016-04-28 10:07:14 -06:00
Nicole Thomas
1a55fcb733 Clarify service state opening docs - uses 'service' virtualname (#32880)
* Clarify service state opening docs - uses 'service' virtualname

Fixes #30855

* Add a few more clarifications to service state docs

And link to service execution modules list.
2016-04-27 14:32:27 -06:00
Nicole Thomas
e1b40b3b76 Merge pull request #32884 from terminalmage/fix-incorrect-deprecation-notice
Fix incorrect deprecation notice
2016-04-27 09:47:35 -06: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
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
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
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