Commit Graph

3717 Commits

Author SHA1 Message Date
rallytime
49f40e9d99 Merge branch '2016.3' into 'develop'
Conflicts:
  - doc/conf.py
  - doc/topics/reactor/index.rst
  - tests/integration/__init__.py
2016-07-12 16:13:56 -06:00
rallytime
f734afd0b0 Merge branch '2015.8' into '2016.3'
Conflicts:
  - salt/modules/aptpkg.py
  - tests/integration/__init__.py
2016-07-12 14:29:35 -06:00
Aditya Kulkarni
857208394f Add support for more options to Cassandra CQL returner 2016-07-12 11:50:01 -04:00
Loren Gordon
bfe0dd0b8a Clarifies the proper way to reference states
It seems in some situations, or in some earlier version, using a `/`
to reference sls files in subdirectories did work. However, because
of the inconsistency it caused occasional confusion. This updates the
tutorial to focus on the canonical `.` notation, which always works.
2016-07-12 07:58:27 -04:00
Christer Edwards
220a3ae53f Update freebsd.rst
Updated FreeBSD installation instructions to remove ``priority`` definition. 
(This, I believe, should address an issue submitted in saltstack/salt-bootstrap/issues/908)
2016-07-10 10:22:30 -06:00
Erik Johnson
ae38c874da Add a bunch of documentation on getting files from other environments (#34560)
* Remove :members: from fileserver docs pages

These functions can never be invoked directly from the CLI, so it is
pointless to include them in the documentation.

* Rename section

* Add docs page clarifying how to get files from different environments

* Add reminder that file_roots can be specified for masterless salt

* Link to the new environments page from the states tutorial

* Add information on pulling reactor configs from non-base environments

* Add examples of querystring syntax to cp module
2016-07-08 17:15:27 -04:00
rallytime
86b7c71e09 Merge branch '2016.3' into 'develop'
Conflicts:
  - salt/modules/glusterfs.py
  - salt/states/pkg.py
2016-07-07 13:37:58 -06:00
rallytime
27988dde48 Merge branch '2015.8' into '2016.3'
Conflicts:
  - doc/ref/configuration/minion.rst
2016-07-07 12:31:12 -06:00
Mike Place
63f0451041 Merge pull request #34498 from rallytime/bootstrap-tutorial-doc-fix
Use -O in the wget example in the bootstrap tutorial for the develop branch
2016-07-07 10:30:46 -06:00
Erik Johnson
8722257b82 Improve top file merging documentation (#34505)
* Add top file config params to minion config file documentation

* Improve documentation on top file merging behavior

* Add recommendation on changing top_file_merging_strategy

* Improve the log message warning of multiple top files
2016-07-07 12:04:27 -04:00
rallytime
23c5739c3b Use -O in wget develop example in bootstrap tutorial 2016-07-06 15:23:39 -06:00
rallytime
2b307b7ea1 Merge branch '2015.8' into '2016.3'
Conflicts:
  - salt/states/file.py
  - tests/unit/states/file_test.py
2016-07-06 09:12:25 -06:00
rallytime
e4a8c585d0 Merge branch '2016.3' into 'develop'
Conflicts:
  - salt/states/pkg.py
2016-07-05 13:11:32 -06:00
C. R. Oldham
0a264597ca Forgot reference to inotify (#34455) 2016-07-05 12:32:49 -04:00
rallytime
8398de0baf Merge branch '2015.8' into '2016.3'
No conflicts.
2016-06-30 16:08:57 -06:00
Mike Place
d4c04e07f0 Merge pull request #34358 from thatch45/thor_more
Add Thorium states to auto clean out old keys
2016-06-30 11:37:32 -07:00
C. R. Oldham
6cce575d40 Clarify that salt-cloud doesn't get installed by bootstrap 2016-06-30 10:27:52 -06:00
Thomas S Hatch
c6882ca974 suggest a sane default interval 2016-06-30 09:45:17 -06:00
Joseph Hall
fb3f05dfd7 Update dependency docs for SPM (#34385)
* Update dependency docs for SPM

* Typo
2016-06-30 11:12:26 -04:00
Thomas S Hatch
29b6253b3e Add all the things I always forget :) 2016-06-29 09:47:34 -06:00
Thomas S Hatch
d4d79d95ea update docs to a workign example 2016-06-28 21:19:52 -06:00
rallytime
cc83fa151a Merge branch '2016.3' into 'develop'
Conflicts:
  - salt/modules/status.py
  - salt/utils/__init__.py
  - tests/unit/modules/boto_vpc_test.py
  - tests/unit/modules/mount_test.py
  - tests/unit/states/boto_vpc_test.py
2016-06-28 17:34:27 -06:00
rallytime
f9ab8ba46d Merge branch '2015.8' into '2016.3'
No conflicts.
2016-06-28 14:26:24 -06:00
rallytime
f44a0543fe Fix test example in integration testing docs
The example is out of date compared to the actual test it's modeling.

Notably, the self.state_result() function doesn't exist.
2016-06-27 10:22:15 -06:00
Alexander Krasnukhin
a8514d9058 Update correct default value for spm_build_dir
Looks like docs have wrong default directory for `spm_build_dir` config option. It is actually `/srv/spm_build`.
2016-06-27 13:11:23 +02:00
Seth House
6639b347d0 Add 'delete' key event to list (#34189) 2016-06-22 11:23:49 -04:00
rallytime
8479c45728 Merge branch '2016.3' into 'develop'
No conflicts.
2016-06-21 17:29:44 -06:00
rallytime
318c2ed6a1 Merge branch '2015.8' into '2016.3'
Conflicts:
  - salt/cli/salt.py
  - salt/modules/grains.py
  - tests/unit/modules/boto_vpc_test.py
2016-06-21 16:03:31 -06:00
Nicole Thomas
47595d6795 Typo fix (#34174) 2016-06-21 12:08:43 -04:00
rallytime
73f3e12ce6 Update package dep note to systemd-python for RHEL7 install
Fixes #34120
2016-06-20 08:53:42 -06:00
rallytime
d957c29704 Merge branch '2016.3' into 'develop'
Conflicts:
  - salt/master.py
  - salt/utils/parsers.py
2016-06-16 17:08:39 -06:00
rallytime
f6bfaede21 Merge branch '2015.8' into '2016.3'
Conflicts:
  - doc/topics/installation/index.rst
  - salt/master.py
  - salt/modules/mac_brew.py
  - salt/modules/pacman.py
  - salt/modules/solarisips.py
  - salt/returners/postgres_local_cache.py
  - salt/states/apache_module.py
  - salt/utils/minions.py
  - tests/unit/acl/client_test.py
2016-06-16 16:10:41 -06:00
Thomas S Hatch
dd26d6fd74 Merge pull request #34009 from rallytime/bp-33948
Back-port #33948 to 2016.3 + add log message
2016-06-16 15:01:09 -06:00
Anthony Elizondo
2d7ce4cde1 Typo fix (#34066) 2016-06-16 15:04:04 -04:00
Thomas S Hatch
bf3e7c83b0 Merge pull request #33837 from lorengordon/masterless-orchestration
Support salt.state orchestration in masterless mode
2016-06-16 11:16:53 -06:00
rallytime
9d049e28e5 Merge branch '2016.3' into 'develop'
Conflicts:
  - salt/modules/win_pkg.py
  - salt/states/disk.py
2016-06-15 17:13:26 -06:00
Nicole Thomas
f546a00dc9 Merge pull request #34025 from rallytime/merge-2016.3
[2016.3] Merge forward from 2015.8 to 2016.3
2016-06-15 15:41:00 -04:00
Loren Gordon
363d175fb7 Documentation to describe orchestration support for masterless minions 2016-06-15 14:12:53 -04:00
Jacob Hammons
a4b67fd1e9 Updated latest release to 2016.3.1
Clean up installation instructions
code-block type updates
Add link to jinja tutorial
2016-06-15 11:52:02 -06:00
rallytime
78befde62f Add note to release notes about returner minions kwarg change 2016-06-14 12:51:44 -06:00
rallytime
c776d2d795 Add note to release notes about returner minions kwarg change 2016-06-14 10:33:41 -06:00
Mike Place
1132bc5d0b Merge pull request #33995 from jacobhammons/doc-fixes
Understanding Jinja topic, Jinja doc issues.
2016-06-13 19:00:29 -07:00
Mike Place
a400f6a6c3 Merge pull request #33900 from amendlik/gitfs-hook-doc
Document sudo policy for gitfs post-recieve hook
2016-06-13 18:04:35 -07:00
Jacob Hammons
887a415138 Adds new Understanding Jinja topic, and fixes several Jinja doc issues.
Removes the "Full list of builtin ..." from each module reference list, leaving just the module type for scanability.

Refs #12470
Refs #10206
Refs #10480
Refs #23522
Refs #33023
2016-06-13 18:30:42 -06:00
Jacob Hammons
b20213fd79 Adds links to several current Salt-related projects
Removes the salt_projects.rst file which hasn't been updated in a long time, this is replaced by the updated topics/projects/index.rst file
Adds a note about Salt Pack to the installation doc
2016-06-13 17:11:36 -06:00
Adam Mendlik
b4a28e2684 Add clarifying documentation about the need for sudo in the git hook 2016-06-13 13:22:39 -06:00
rallytime
c57bcebaf8 Merge branch '2016.3' into 'develop'
Conflicts:
  - salt/states/boto_lambda.py
2016-06-13 11:18:53 -06:00
Thomas S Hatch
a9c304c73b Merge pull request #33948 from cachedout/optimize_save_load
Save an entire minion cache traversal on each master pub
2016-06-13 09:57:57 -06:00
Mike Place
18df7263ac Merge pull request #33955 from adamchainz/readthedocs.io
Convert readthedocs links for their .org -> .io migration for hosted projects
2016-06-13 08:49:35 -07:00
Aditya Kulkarni
34135e1f67 Add runner for execution modules (#33949)
* Add runner for execution modules

* Make sure all modules load and fix argument passing

* Fix lint error

* Add docs for salt runner
2016-06-13 11:49:26 -04:00
Jacob Hammons
2cf787d4ba 2016.3.0 known issues update 2016-06-12 20:58:21 -06:00
Adam Chainz
64d9a62f89 Convert readthedocs links for their .org -> .io migration for hosted projects
As per [their blog post of the 27th April](https://blog.readthedocs.com/securing-subdomains/) ‘Securing subdomains’:

> Starting today, Read the Docs will start hosting projects from subdomains on the domain readthedocs.io, instead of on readthedocs.org. This change addresses some security concerns around site cookies while hosting user generated data on the same domain as our dashboard.

Test Plan: Manually visited all the links I’ve modified.
2016-06-11 12:33:37 +01:00
Mike Place
98f3a482ac Save an entire minion cache traversal on each master pub
We were doing an extra and unecessary full traversal of the minion
cache. This refactors all returners and the master to reduce this
to a single call. More work will be forthcoming to reduce this even
further, especially in the context of auth lookups.
2016-06-10 15:43:08 -06:00
Mike Place
29a037dae3 Merge pull request #33909 from xlotlu/patch-1
fix formulas map.jinja example when using default values
2016-06-10 08:24:48 -07:00
rallytime
f078d57b57 Merge branch '2016.3' into 'develop'
Conflicts:
  - salt/modules/rabbitmq.py
  - salt/modules/win_servermanager.py
  - salt/state.py
  - salt/states/boto_s3_bucket.py
  - salt/states/pip_state.py
  - salt/states/win_servermanager.py
  - tests/unit/modules/win_servermanager_test.py
  - tests/unit/states/dockerng_test.py
2016-06-09 13:06:10 -06:00
Nicole Thomas
08a584b3e5 Merge pull request #33711 from rallytime/merge-develop-3
[develop] Merge forward from 2016.3 to develop
2016-06-09 14:12:48 -04:00
Ionuț Ciocîrlan
77ebe74fae fix formulas map.jinja example when using default values
Fixed syntax error and replaced `default` kwarg with `base`.

The previous form would lead e.g. for RedHat to `Rendering SLS '...' failed: Jinja variable 'dict object' has no attribute 'server'`.
2016-06-09 19:27:00 +03:00
Seth House
b6ebd7b6ef Add docs for arg/kwarg eauth matching
This adds documentation for the addition in #29153.
2016-06-09 09:13:02 -06:00
Nicole Thomas
00e016ecfc Add note about Xenial packages to 2016.3.0 release notes (#33870)
Refs #32761
2016-06-09 10:52:16 -04:00
Adam Mendlik
1046279cb7 Document sudo policy for gitfs post-recieve hook
Because the hook is run as the user performing the push,
salt-call will typically fail. This documentation change
uses sudo for salt-call, and provides a sudo policy that
permits any user to run the post-recieve hook.
2016-06-09 07:10:12 -06:00
Justin Findlay
06f249901a add 2016.3.1 release notes (#33883) 2016-06-08 16:49:28 -06:00
rallytime
c5b4ec0b0f Merge branch '2015.8' into '2016.3'
Conflicts:
  - salt/cli/salt.py
  - salt/modules/groupadd.py
  - salt/states/service.py
2016-06-08 11:20:18 -06:00
Mike Place
42c5058a1e Add tcptraceroute suggestion to minion troubleshooting docs (#33862)
Closes #33627
2016-06-08 12:19:27 -04:00
Seth House
5ed152fe9b Add docs for arg/kwarg eauth matching
This adds documentation for the addition in #29153.
2016-06-07 20:53:45 -06:00
C. R. Oldham
8332e6f94e Add default proxy config directories /etc/salt/proxy.d and ability for proxies to be configured by opts in addition to pillar 2016-06-03 10:11:34 -06:00
Javier Bértoli
9c587c477d Add example in the docs for varstack as a master_tops 2016-06-03 06:58:30 -03:00
Denys Havrysh
8621f5be54 Debian installation docs: drop section about community-maintained repository 2016-06-02 17:50:47 +03:00
rallytime
9220ea0729 Merge branch '2016.3' into 'develop'
Conflicts:
  - doc/conf.py
  - salt/minion.py
  - salt/modules/mac_brew.py
  - salt/modules/pkgng.py
  - salt/states/apache_module.py
  - salt/states/ini_manage.py
  - salt/states/win_servermanager.py
2016-06-02 10:13:34 -04:00
Mike Place
64ba252256 Merge pull request #33650 from terminalmage/issue29954
Feature: add per-saltenv configuration parameter support
2016-06-01 13:34:30 -07:00
Erik Johnson
c32f432347 Add documentation for per-saltenv configuration parameters 2016-05-31 15:28:21 -05:00
Justin Findlay
9b0eb858a6 add note and workaround to release notes 2016-05-31 11:24:27 -06:00
Wolodja Wentland
259529e25d Use correct state name in libvirt formula doc (#33631)
The state module for libvirt has been renamed to 'virt' from
'libvirt' in 2016.3 and these references to the old name have not been
updated.
2016-05-31 11:09:25 -04:00
Ethan Devenport
668800f76c ProfitBricks cloud provider improvements.
* Added disk_type setting to the profile config and updated documentation.
* Added a config option for setting the provisioning wait_for_timeout and updated documentation.
* Refactored image selection by name.
* Print API request ID in debug logging output.
* Made profile size property optional by allowing predefined size or custom cores/ram/disk.
2016-05-31 02:15:12 +00:00
Mike Place
aa4f9cf59c Merge pull request #33574 from babilen/doc-states-tut-fix-grain-target-expr
Adjust target expression in state tutorial
2016-05-27 08:09:08 -07:00
Wolodja Wentland
9ee0e6e29f Adjust target expression in state tutorial
We either have to use 'os:Fedora' here for the grain matcher or use the
compound matcher.
2016-05-27 13:02:42 +02:00
Drew Adams
f15ce68097 change OpenSuse to openSUSE 2016-05-26 22:11:20 -07:00
Drew Adams
bcd6a1cd77 fix osfamily from Suse to SUSE 2016-05-26 22:08:40 -07:00
jacobhammons
65df3a6fa2 Refs #33543 2016-05-26 09:58:42 -06:00
Jacob Hammons
6904936f58 New doc site layout, 2016.3.0 release note known issue additions 2016-05-25 18:09:37 -06:00
Jacob Hammons
a424c38f5d New doc site layout, 2016.3.0 release note known issue additions 2016-05-25 17:39:55 -06:00
rallytime
a5e0141eda Merge branch '2015.8' into '2106.3'
Conflicts:
  - salt/beacons/__init__.py
  - salt/modules/saltutil.py
  - salt/modules/zypper.py
  - salt/states/grains.py
  - salt/states/pkgrepo.py
  - salt/states/service.py
2016-05-25 13:44:21 -06:00
rallytime
cfc07f7641 Add docs about minion config file in standalone minion docs
Fixes #15252
2016-05-25 11:00:12 -06:00
Jεan Sacren
e39c3e29b4 Fix trivial grammar and spelling errors in the doc 2016-05-25 00:07:44 -06:00
Nicole Thomas
00f9090928 Add docs about PyYAML's 1024 character limitations for simple keys (#33459)
Fixes #33389
2016-05-24 08:12:21 -07:00
rallytime
e6bbc82b58 Merge branch '2016.3' into 'develop'
Conflicts:
  - salt/grains/core.py
  - salt/modules/aptpkg.py
  - salt/pillar/stack.py
  - salt/returners/local_cache.py
  - salt/runners/manage.py
2016-05-23 16:22:37 -06:00
rallytime
3aa1e6701c Merge branch '2015.8' into '2016.3'
Conflicts:
  - salt/modules/win_pkg.py
2016-05-23 15:10:06 -06:00
rallytime
7c41c34528 Merge branch '2015.5' into '2015.8'
No conflicts.
2016-05-23 09:40:21 -06:00
Justin Findlay
2cc650965a update 2015.5.11 release notes (#33412) 2016-05-20 15:08:35 -06:00
Nicole Thomas
336fbb03bc [develop] Merge forward from 2016.3 to develop (#33408)
* Fix master hanging after a request from minion with removed key. (#33333)

* ZMQ monitor for MWorker connections.

* Reauth minion if the key was removed on the master side.

* Allow concurrency mode in state runs if using sudo (#33325)

Closes #30130

* Disambiguate non-exact matches when checking if sysv service is enabled (#33324)

Fixes #33323

* remove redundant, incorrect sudo_runas config documentation (#33318)

* remove sudo_runas documentation

`sudo_runas` was renamed to `sudo_user` and the documentation was not
updated accordingly.

* conf/minion: update sudo_user description

The description from sudo_runas was better.

* import ps from psutil_compat in beacons (#33334)

* beacons.network_info: import gate psutil

* beacons.ps: import gate psutil

* Add docs for mine_functions config var (#33326)

* Add docs for mine_functions config var

* Note that mine_enabled essentially just doesn't add the mine
update function to the scheduler.

* Bp 28467 calm mine (#33327)

* make minion mine update behavior more configurable

* Add docs for mine_functions config var

* Remove config dup from mine config options

Refs #28467

* 2015.8 does not have _DFLT_MULTIPROCESSING_MODE

* This won't be in until 2015.8.10.

* Fix network.managed for windows (#33312)

* Fix some link errors in the test writing tutorial (#33347)

* Describes parameters in register_instances function (#33339)

* Fix UnboundLocalError in git.latest (#33340)

Resolves #32260.

* Expanded documentation for boto_elb state and module (#33341)

* Describes what happens when the CNAME parameter is given.

* Describes what the recognized attributes are for for ELBs.

* Properly detect newer Linux Mint distros (#33359)

* Properly detect newer Linux Mint distros

LMDE 2 and Linux Mint 17.3 changed the DISTRIB_ID in /etc/lsb-release to
``LinuxMint``, breaking OS detection for these distros.

This commit fixes that by adding an entry to the OS_NAME_MAP in the core
grains.

* Remove LinuxMint os_family from aptpkg.py

It is no longer necessary as the distro is now detected properly, which
will lead to an os_family of Debian.

* Update job_cache and keep_jobs docs to be more specific to their behavior (#33328)

* Update job_cache and keep_jobs docs to be more specific to their behavior

Also fixed a bug discovered when investigating job_cache/keep_jobs functionality
where the jid directory and files were removed by the cache cleaner, but not the
original jid clash detection directory created in /var/cache/salt/master/jobs/.

Fixes #29286

* Add testcase for the changes in the local_cache.clean_old_jobs func

* Mark tests as destructive

* Put destructive test decorator in correct location

* Remove mentions of windows not supporting pkgs param (#33361)

Fixes #33313

* Updates docs version to 2015.8.9
Adds note regarding the os grain on Mint Linux
Adds an FAQ regarding grains that change due to upstream changes

* revved 2015.8 branch to .9 in version selector

* Add initscripts, SystemD service units and environment files for Debian (#32857)

* Add note to docs about api settings for Hipchat API v2 (#33365)

Fixes #27779

* Add win_pkg to list of modules that support "version" in pkg.installed (#33362)

Fixes #32913

* Add note about name parameter in git_pillar docs (#33369)

Fixes #27737

* Better YAML syntax error handling (#33375)

Closes #26574

* Improve doc clarity for disable_modules documentation (#33379)

* Improve doc clarity for disable_modules documentation

* Additional clarification on blacklisted name

* maintain the fallabck because I am totally sick of this crap

* blast, put the try/except int he right place

* restore whitespace

* Fix traceback in logging for config validation (#33386)

* 2015.8.10 release notes

* Sync pillarstack to latest upstream version (#33391)

* Don't lay down all available opts (#33385)

* Don't lay down all available opts

* We need at least one opt in there

* Condense defaults

* Put the default hash type back
2016-05-20 13:48:40 -07:00
Nicole Thomas
637c2af0ad Add note to absolute_imports practice about __future__ import (#33377)
Fixes #31430
2016-05-20 10:32:25 -07:00
rallytime
1febb0e13a Merge branch '2015.8' into '2016.3'
No conflicts.
2016-05-20 10:35:25 -06:00
Jacob Hammons
e850c298a9 2015.8.10 release notes 2016-05-20 10:01:32 -06:00
rallytime
35ad788470 Merge branch '2015.8' into '2016.3'
Conflicts:
  - conf/minion
  - doc/ref/configuration/minion.rst
  - salt/modules/boto_elb.py
  - salt/modules/sudo.py
  - salt/states/boto_elb.py
  - salt/transport/zeromq.py
2016-05-19 16:22:36 -06:00
Jacob Hammons
c56d25cf02 revved latest to 2015.8.9, added note regarding Mint Linux to 2015.8.9 release notes 2016-05-19 14:10:27 -06:00
Jacob Hammons
146b4df6be Updates docs version to 2015.8.9
Adds note regarding the os grain on Mint Linux
Adds an FAQ regarding grains that change due to upstream changes
2016-05-19 13:41:35 -06:00
Mike Place
d5a3e309bf Event assert (#33262)
* Initial POC

* Allow the queue to fill by waiting for the lag in IPC

* Add docs

* Add run_tests

* Add reactor to tests
2016-05-19 13:41:23 -06:00
Nicole Thomas
4fdb097c01 Update job_cache and keep_jobs docs to be more specific to their behavior (#33328)
* Update job_cache and keep_jobs docs to be more specific to their behavior

Also fixed a bug discovered when investigating job_cache/keep_jobs functionality
where the jid directory and files were removed by the cache cleaner, but not the
original jid clash detection directory created in /var/cache/salt/master/jobs/.

Fixes #29286

* Add testcase for the changes in the local_cache.clean_old_jobs func

* Mark tests as destructive

* Put destructive test decorator in correct location
2016-05-19 09:32:32 -07:00
Nicole Thomas
5c29c65ff4 Fix some link errors in the test writing tutorial (#33347) 2016-05-18 18:57:50 -06:00
rallytime
7bf9f5d0f5 Merge branch '2016.3' into 'develop'
Conflicts:
  - doc/man/salt.7
  - doc/ref/executors/all/salt.executors.direct_call.rst
  - doc/ref/executors/all/salt.executors.splay.rst
  - doc/ref/executors/all/salt.executors.sudo.rst
  - salt/cloud/clouds/vultrpy.py
2016-05-18 09:40:48 -06:00
rallytime
779f31cc20 Merge branch '2015.8' into '2016.3'
Conflicts:
  - doc/ref/configuration/minion.rst
2016-05-17 13:41:19 -06:00