valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
80,734 Commits 24 Branches 182 Tags 341 MiB
5f3f48b89e
Commit Graph

7192 Commits

Author SHA1 Message Date
Ch3LL
1853c998c4 add initial 2016.11.4 release notes 2017-03-01 09:47:07 -07:00
nafg
e48f22c301 Add "Edit on GitHub" link to the docs 2017-03-01 00:34:22 -05:00
Pedro Algarvio
40a64191a1
Absolute imports and A LOT of code cleanup. 2017-03-01 01:33:07 +00:00
rallytime
452822f5f7 Merge branch '2016.11' into 'develop' 
No conflicts.
 2017-02-28 17:14:40 -07:00
Nicole Thomas
8809d33674 Merge pull request #39701 from rallytime/merge-develop 
[develop] Merge forward from 2016.11 to develop
 2017-02-28 12:50:10 -07:00
Nicole Thomas
7b4865c058 Merge pull request #39729 from rallytime/update-release-ver-2016.11 
[2016.11] Bump latest release version to 2016.11.3
 2017-02-28 11:08:25 -07:00
rallytime
7cc49adef5 [develop] Bump latest release version to 2016.11.3 2017-02-28 09:03:40 -07:00
rallytime
b5a7111ad9 [2016.11] Bump latest release version to 2016.11.3 2017-02-28 09:03:05 -07:00
rallytime
c9bc8af8f2 [2016.3] Bump latest release version to 2016.11.3 2017-02-28 09:01:24 -07:00
Denys Havrysh
1d86cf1161 DOCS: add 2nd level header for advanced targeting methods 2017-02-28 16:23:53 +02:00
Erik Johnson
7b958fb389 Add options to skip fileserver/git_pillar preflight checks 
This commit also modifies the master config for the test suite to use
this new option, so that a missing GitPython/Pygit2 will not crash the
test suite's master. This should make the test suite run smoother by
only negatively impacting those tests which require the pillar data
provided by git_pillar, when a valid provider is not available.
 2017-02-27 20:21:53 -06:00
Joseph Hall
ded8040b55 Update docs 2017-02-27 17:51:00 -07:00
Mike Place
87642bc4ab Merge pull request #39691 from gtmanfred/develop 
add syncing seperate cache modules on the salt master
 2017-02-27 17:03:45 -07:00
rallytime
b4366103a6 Merge branch '2016.11' into 'develop' 
Conflicts:
  - .pylintrc
  - .testing.pylintrc
  - salt/fileclient.py
  - salt/minion.py
  - salt/modules/docker.py
  - salt/modules/win_iis.py
  - salt/states/docker.py
  - salt/states/file.py
  - salt/utils/__init__.py
  - tests/integration/modules/test_sysmod.py
 2017-02-27 15:11:37 -07:00
Mike Place
cbd66a0d3f Merge pull request #39676 from F30/hash-comment 
Fix comments about the "hash_type" option
 2017-02-27 13:11:40 -07:00
Daniel Wallace
88e8a1b1c6 add syncing seperate cache modules on the salt master 2017-02-27 12:15:46 -06:00
Felix Dreissig
5371bc0996 Fix comments about the "hash_type" option 
Previous mentions of the correct default value (it really is sha256)
somehow got lost along the way.
Also, some comments seem to have gotten duplicated instead of updated.
 2017-02-26 23:24:54 +01:00
Felix Dreissig
78a185ab11 Fix comments about file backup directory 
The actual file state backup directory is called "file_backup" without a
trailing 's'.
 2017-02-26 22:49:29 +01:00
Mike Place
e540b4616e
Update Solaris installation document 
The OpenCSW packages are no longer maintained. Include details about
installing via setup.py.
 2017-02-25 19:24:02 -07:00
Mike Place
cfeda912f6 Merge pull request #39629 from terminalmage/pr-34327 
Implement git_pillar mountpoints
 2017-02-24 16:30:32 -07:00
Erik Johnson
f6b9152a9e Add no_block feature to Nitrogen release notes 2017-02-24 15:14:09 -06:00
Erik Johnson
9a2193e8f2 Add git_pillar mountpoints feature to Nitrogen release notes 2017-02-24 10:37:28 -06:00
Erik Johnson
8277e42bc1 Add pillar-environments anchor 2017-02-23 22:14:25 -06:00
Erik Johnson
cc2984e71a Add file-roots-directory-overlay anchor 2017-02-23 22:14:25 -06:00
Erik Johnson
0838331355 Add git_pillar_includes config option 2017-02-23 22:14:24 -06:00
Erik Johnson
862a3ec309 Different default value in example for pillarenv 2017-02-23 22:14:24 -06:00
Erik Johnson
2db0f2af4d Add versionadded for pillarenv_from_saltenv 
I forgot to add this when initially implementing this feature.
 2017-02-23 22:14:24 -06:00
Pedro Algarvio
2a76618b17
Fix templates for the new test module naming scheme 2017-02-23 23:19:44 +00:00
rallytime
13622899d2 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - doc/topics/development/contributing.rst
 2017-02-23 14:37:48 -07:00
Mike Place
652044b18f
A note in the docs about mentionbot 2017-02-22 19:34:02 -07:00
Mike Place
5987c4e30e Merge pull request #39573 from thatch45/ssl_docs 
Added a few more comments to the ssl docs
 2017-02-22 19:17:13 -07:00
Mike Place
b8e321cbec Merge pull request #39577 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2017-02-22 19:10:11 -07:00
rallytime
7b9b3f700d Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/modules/dockerng.py
  - salt/states/dockerng.py
 2017-02-22 16:27:08 -07:00
rallytime
2595ac383d Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/config/__init__.py
  - salt/modules/docker.py
  - salt/states/docker.py
 2017-02-22 16:24:36 -07:00
Ch3LL
c0f8c35df7 fix reference to set in docs 2017-02-22 16:09:16 -07:00
Ch3LL
663f6f159d add additional PRs to 2016.11.3 release notes 2017-02-22 16:04:05 -07:00
Thomas S Hatch
b230c35eac This should be good to go now 2017-02-22 14:29:24 -07:00
Mike Place
c10965833a Merge pull request #39289 from bobrik/autodetect-ipv6 
Autodetect IPv6 connectivity from minion to master
 2017-02-22 12:05:32 -07:00
Mike Place
b492f7094c Merge pull request #39528 from thatch45/ssl_docs 
Add better ssl option docs
 2017-02-22 11:29:46 -07:00
Mike Place
b516e2968c Merge pull request #39539 from brd/doc-saltmine 
Improve the Salt Mine documentation
 2017-02-22 11:24:39 -07:00
rallytime
c46f82c029 Merge branch '2016.11' into 'develop' 
Conflicts:
  - requirements/dev_python27.txt
  - requirements/dev_python34.txt
 2017-02-21 14:20:20 -07:00
rallytime
c613d19e76 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/modules/dockerng.py
  - salt/states/dockerng.py
 2017-02-21 13:59:14 -07:00
Brad Davis
99fd63586f Better explain what we are setting in these files for new users. Also note 
where the variable server comes from.
 2017-02-21 12:34:18 -07:00
Brad Davis
f08cbd67b4 Explain what changing the mine_interval on the minion does and how to have all the minions update at will 2017-02-21 12:09:09 -07:00
Brad Davis
b8b9c633a1 Add example output for the pillar.items command 2017-02-21 11:57:23 -07:00
Brad Davis
4142b4bcd3 Show how to force the pillar refresh and verify the pillar contains what we expect 2017-02-21 11:40:12 -07:00
Brad Davis
bb622a68b2 Further explain the additional function arguments and where to find them 2017-02-21 11:39:03 -07:00
Brad Davis
1356dd6cc0 Explain where the functions available as mine_functions come from. 2017-02-21 11:37:12 -07:00
Thomas S Hatch
c357e37831 Add minion config 2017-02-21 11:09:46 -07:00
Thomas S Hatch
539bb2aa80 Add better ssl option docs 2017-02-21 08:48:42 -07:00
Mike Place
75021cdb4c Merge pull request #39406 from thatch45/parallel_states 
Parallel states
 2017-02-19 10:58:35 -07:00
Erik Johnson
c673d06f48 Rename dockerng state/execution module to docker 2017-02-18 21:58:25 -06:00
Erik Johnson
6e24dd85c4 Remove dockerio state/module (moved to salt-contrib) 2017-02-18 21:58:24 -06:00
Mike Place
deba6d2655 Merge pull request #39367 from gtmanfred/develop 
add extmod_blacklist to make it easier to remove modules
 2017-02-17 16:57:44 -07:00
Mike Place
13b254aa7b Merge pull request #39363 from cloudflare/napalm_px 
New execution module: napalm helpers
 2017-02-17 16:55:10 -07:00
Thomas S Hatch
3a78c49b61 Fix some obvious oversights 2017-02-17 16:07:52 -07:00
Mike Place
bf68f9c73c Merge pull request #39404 from Mac21/add-subnets-cloud-gce 
Add subnetwork support to GCE Cloud Module.
 2017-02-17 11:40:46 -07:00
Cory Wright
cc90d0d53f The Reactor docs should use pillar='{}' instead of 'pillar={}' 2017-02-17 11:07:39 -06:00
toller
3ab83e5d94 Fix documentation about deleting subnetwork and network when recources are using them. 2017-02-17 09:53:03 -07:00
Ionuț Ciocîrlan
ebe2c3e83b grammar in states/top.rst 2017-02-17 00:26:45 +02:00
Mike Place
e9b034f02f Merge pull request #39458 from rallytime/fixup-more-doc-build-warnings 
Fix more warnings in doc build
 2017-02-16 14:45:51 -07:00
Nicole Thomas
1577bb68af Merge pull request #39459 from rallytime/merge-develop 
[develop] Merge forward from 2016.11 to develop
 2017-02-16 14:30:31 -07:00
Mike Place
e4f8c2bfb0 Merge pull request #39437 from sakateka/fixes_about_saltfile 
Fixes about saltfile
 2017-02-16 13:32:14 -07:00
Mike Place
b17931a653 Merge pull request #39455 from UtahDave/develop 
add Salt Enterprise photo
 2017-02-16 12:39:20 -07:00
rallytime
dda39d4e63 Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/minion.py
  - salt/modules/file.py
  - salt/modules/grains.py
  - salt/utils/gitfs.py
 2017-02-16 12:18:46 -07:00
David Boucha
570e14250d add Salt Enterprise photo 2017-02-16 11:50:28 -07:00
rallytime
e698bc3508 Fix more warnings in doc build 2017-02-16 11:20:35 -07:00
Megan Wilhite
1acf00da3b add 2016.11.3 changelog to release notes (#39451) 2017-02-16 10:49:53 -07:00
Mike Place
8e2cbd2307 Merge pull request #39448 from gtmanfred/2016.11 
Add release notes for cisco proxy minions added in Carbon
 2017-02-16 10:29:47 -07:00
Daniel Wallace
3172e88700 Add release notes for cisco proxy minions added in Carbon 2017-02-16 10:05:33 -06:00
Mircea Ulinic
30995955ce Include doc 2017-02-16 16:04:40 +00:00
Mircea Ulinic
ec5a43c9e6 Add doc for the new napalm execution module 2017-02-16 16:04:40 +00:00
Sergey Kacheev
f3f129c8f1 document ~/.salt/Saltfile 2017-02-16 17:39:22 +07:00
Ari Maniatis
4af0514def Improve introduction to explain the purpose of orchestration 
Before diving into technical details tell the user why they want this feature.
 2017-02-16 18:52:05 +11:00
Jean-Claude Computing
94f349a900 Fix documentation for detach's default value 2017-02-15 20:29:29 +01:00
Daniel Wallace
d332b33c8a add extmod_blacklist to make it easier to remove modules 2017-02-15 12:47:32 -06:00
rallytime
6d78adbf08 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - doc/topics/tutorials/gitfs.rst
  - salt/fileserver/roots.py
  - salt/loader.py
 2017-02-15 10:35:02 -07:00
Mike Place
415102f346 Merge pull request #39411 from rallytime/fix-38762 
Update external_cache docs with other configuration options
 2017-02-15 10:30:39 -07:00
Erik Johnson
7e1803b617 Update docs on upstream EPEL7 pygit2/libgit2 issues (#39421) 
pygit2 was rebuilt, but libgit2 still needs a rebuild. I opened an
upstream bug report this morning, this updates the docs to reflect the
current status of this upstream issue.
 2017-02-15 10:10:39 -07:00
rallytime
e13febe58d Update external_cache docs with other configuration options 
There are more places than just the minion config file to define
external job cache configuration settings for minions. This change
updates the docs to include some of those other places and the
order in which they're evaluated if the settings are defined in
more than one place.

Fixes #38762
 2017-02-14 17:18:35 -07:00
Thomas S Hatch
aa6518cac7 Add docs 2017-02-14 13:51:55 -07:00
toller
2cc6ce7b51 Add subnetwork support to GCE Cloud Module. 
Implements #39258
 2017-02-14 12:48:57 -07:00
Mike Place
3ec9e043fa Merge pull request #39306 from markuskramerIgitt/writing_documentation 
rst table requires plus-signs for column
 2017-02-13 14:59:08 -07:00
William Giokas
0647dc8aab doc: Fix the Nix documentation (#39343) 2017-02-13 09:42:37 -07:00
Elias Probst
2021f5b537 Add creation/configuration of Salt PKI dirs to hacking docs (#39341) 2017-02-13 09:39:42 -07:00
Erik Johnson
fa3014393c Document the upstream RedHat bug with their pygit2 package (#39316) 
See https://github.com/saltstack/salt/issues/38630#issuecomment-274403448
 2017-02-10 16:09:35 -07:00
rallytime
c1df446b7a Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/returners/postgres.py
  - salt/returners/postgres_local_cache.py
 2017-02-10 10:18:26 -07:00
rallytime
0b8dddf12b Merge branch '2015.8' into '2016.3' 
No conflicts.
 2017-02-10 08:24:51 -07:00
markuskramerIgitt
2a40840421 rst table requires + signs for column 2017-02-10 12:33:57 +01:00
markuskramerIgitt
7e25c637d9 wrong git branch 2017-02-10 12:29:13 +01:00
markuskramerIgitt
96958f4706 Merge branch 'develop' of https://github.com/saltstack/salt into develop 2017-02-10 12:24:20 +01:00
markuskramerIgitt
6f165a954a rst table requires + signs for column 2017-02-10 12:20:34 +01:00
Mike Place
fc551bcf5d Merge pull request #39293 from sergeizv/grammar-fix 
Grammar fix
 2017-02-09 15:49:10 -07:00
Mike Place
8a1b45632a Merge pull request #39295 from sergeizv/typo-fix 
Fix typo
 2017-02-09 15:48:58 -07:00
Mike Place
cfaafece34 Merge pull request #39296 from sergeizv/whitespace-fix 
Whitespace fix in docs Makefile
 2017-02-09 15:26:23 -07:00
Mike Place
1d813bd902 Merge pull request #39283 from rallytime/merge-develop 
[develop] Merge forward from 2016.11 to develop
 2017-02-09 15:10:03 -07:00
Mike Place
8dff26bd18 Merge pull request #39267 from KaiSforza/nix 
Add nix module to Salt
 2017-02-09 15:08:46 -07:00
Mike Place
5caa083024 Merge pull request #39250 from Juniper/develop 
junos specific changes to add more feature and enhancements to our APIs
 2017-02-09 14:49:09 -07:00
Erik Johnson
fbd551e069 Add note about using saltenv jinja var in pillar top files 
This adds some useful information to the pillar docs.
 2017-02-09 14:39:09 -06:00
William Giokas
5cb25025c9 Add nix module to Salt 
This module adds the ability to work with nix packages, and do some
basic operations on the nix store. There is still some work to be done,
but this lets you orchestrate some basic tasks for a system with nix
installed.
 2017-02-09 14:18:50 -06:00
Ivan Babrou
55965ce505
Autodetect IPv6 connectivity from minion to master 2017-02-09 11:33:21 -08:00
Sergei Zviagintsev
1d4c1dc140 Whitespace fix in docs Makefile 
Remove extra empty line
 2017-02-09 19:19:09 +01:00
Sergei Zviagintsev
04bde6eed2 Fix link in proxyminion guide 2017-02-09 19:18:13 +01:00
Sergei Zviagintsev
5d9f36d58d Fix typo 
manor -> manner
 2017-02-09 19:16:08 +01:00
Sergei Zviagintsev
70f2b586d3 Rewrap paragraph 
Rewrap the paragraph to fit in 80 chars line. The contents isn't
changed.
 2017-02-09 19:13:01 +01:00
Sergei Zviagintsev
e6ab5178ea Grammar fix 
Use 'if' instead of 'in case'
 2017-02-09 19:02:29 +01:00
Mike Place
04161b001d Merge pull request #39248 from gtmanfred/develop 
add runas as a global state variable
 2017-02-09 10:36:15 -07:00
rallytime
609e6e4b23 Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/config/__init__.py
  - salt/modules/win_lgpo.py
  - salt/utils/aws.py
  - tests/unit/utils/schema_test.py
 2017-02-09 10:29:40 -07:00
Mike Place
bac99d9e72 Merge pull request #39252 from gtmanfred/extmod_whitelist 
Allow specifying which modules should be used when running saltutil.sync_*
 2017-02-09 10:09:43 -07:00
Erik Johnson
d35c2f810c salt.utils.gitfs: remove dulwich support, make refspecs configurable (#39210) 
* Add config params for custom refspecs

* Add exceptions for errors encountered modifying git config

* Make the refspecs a configurable parameter

* Make refspecs a per-remote parameter

* Update master config template to include custom refspecs opts

* Add documentation for new config params

* Update GitFS walkthrough with a section on custom refspecs

* Remove dulwich support from salt.utils.gitfs

Dulwich still lacks important features, including (but not limited to)
the following:

- Lack of the necessary support for checking out a ref needed for
  git_pillar/winrepo support

- No support in its config objects for multivar git config items, making
  it impossible to detect when repos have multiple refspecs set for a
  given git remote

Given this information, and the fact that it trails as a distant third
to Pygit2 and GitPython, Salt will cease to support Dulwich as a git
interface moving forward.

* Excise references to dulwich from documentation

* Add mention of custom refspecs to Nitrogen release notes

* Add gitfs_refspecs to mocked opts in gitfs integration tests

Also remove dulwich from unit tests

* Add information about opts argument not being intended for CLI use
 2017-02-09 09:50:45 -07:00
Daniel Wallace
e6f243e4cd add note to clean_dynamic_modules 2017-02-08 14:50:04 -06:00
Daniel Wallace
b0b2b5482b add sync_sdb to salt-run saltutil 2017-02-08 14:43:40 -06:00
Daniel Wallace
413ae19592 document extmod_whitelist 
for master and minion configs
 2017-02-08 14:41:39 -06:00
Daniel Wallace
45d9a5f49c add documentation for the global runas state option 2017-02-08 14:01:38 -06:00
vnitinv
3d9dd685f5 Merge remote-tracking branch 'upstream/develop' into develop 2017-02-08 23:06:48 +05:30
Marc-Aurèle Brothier
2c3ab01811 Add link in toc for cloudstack page 2017-02-08 14:03:31 +01:00
Mike Place
d5d39321c8 Merge pull request #37808 from cloudflare/JINJA-FILTERS 
Jinja filters
 2017-02-07 14:52:23 -07:00
Mike Place
0f838b2b12 Merge pull request #38621 from terminalmage/pr34442 
Add support for wildcard versions in pkg.installed states
 2017-02-07 14:41:14 -07:00
Mike Place
9863b24136 Merge pull request #39196 from carlpett/patch-3 
Clarify where sdb profiles need to be configured
 2017-02-07 09:45:09 -07:00
Erik Johnson
18729f3713 Add wildcard versions to Nitrogen release notes 2017-02-07 08:54:26 -06:00
vnitinv
e48fff4192 Merge remote-tracking branch 'upstream/develop' into develop 2017-02-07 11:27:43 +05:30
Nitin Kumar
49b9f00643 Merge branch 'develop' into develop 2017-02-07 11:14:25 +05:30
rallytime
2f74dcf685 Various doc updates to fix warnings in doc build 2017-02-06 16:56:58 -07:00
Marc-Aurèle Brothier
786948ca98 Doc: add getting started page for CloudStack provider based on Exoscale as an example 
Signed-off-by: Marc-Aurèle Brothier <m@brothier.org>
 2017-02-06 21:13:38 +01:00
rallytime
7ea5f7f82f Merge branch '2016.3' into '2016.11' 
No conflicts.
 2017-02-06 12:33:52 -07:00
Mike Place
f8d79076f2 Merge pull request #39013 from terminalmage/zh878 
Decryption of values in Pillar SLS files
 2017-02-06 12:08:57 -07:00
Mike Place
46d8bfd026 Merge pull request #39034 from rallytime/doc-updates-develop 
Update autodoc topics for new modules added in develop
 2017-02-06 11:53:41 -07:00
Calle Pettersson
5a017d733b Clarify where sdb profiles need to be configured 2017-02-06 19:46:33 +01:00
Mike Place
b0ea6d74c9 Merge pull request #39099 from cloudflare/JINJA-LOG 
Log module
 2017-02-06 11:40:11 -07:00
Mike Place
d56cc4d3fc Merge pull request #39167 from rallytime/merge-develop 
[develop] Merge forward from 2016.11 to develop
 2017-02-06 11:27:36 -07:00
Inveracity
1962c778bd update GCE docs adding subnetwork parameter 
Updating docs to reflect merge #39072
 2017-02-05 12:12:35 +01:00
rallytime
5aeddf42a0 Restore "Salt Community" doc section 
This was moved to the `topics/index.rst` page in PR #10792, but
seems to have been accidentally removed in PR #30770.
 2017-02-03 16:43:04 -07:00
rallytime
8edfb82e90 Fix doc build errors in junos_syslog engine 
- Moved the module-level Parser() call to the class level
- Added twisted imports to list of MOCK_MODULES
- Also added msgpack to handle some other errors
 2017-02-03 11:59:47 -07:00
rallytime
88cc195a2a Merge branch '2016.11' into 'develop' 
No conflicts.
 2017-02-03 10:58:55 -07:00
Jorge Schrauwen
387b10be25 zone state for Solaris 10/illumos (#39155) 
* create zone state, zone.running, and zone.stopped

* renamed zone.running and zone.stopped, minor lint fixes

* cleanup message in zonecfg to make it clear for the zone state

* zone.property_present state

* zonecfg.set_property - should handle true/false parsed as boolean

* zonecfg module should be more consistant with message

* zone.property_absent implemented

* fix more minor issues in zonecfg when values get parsed as bool

* zonecfg fix spelling error

* improved zonecfg error message handling

* zonecfg parser should also do the reverse

* more improvements in zonecfg for parsing values

* small tweak to zonecfg simplyfy code for the zone state

* Add resource_present to zone state

* zonecfg lint fixes

* resource_absent state, lint fixed, test support

* zonecfg should be a bit more careful when removing the exported config

* zone.export state

* zone.import state

* zone.absent implemented

* zone.attached and zone.detached implemented

* very minor consistency fixes

* added zone.installed and zone.uninstalled, made zone.detached and zone.halted not fail on missing zone

* handle bool values in _parse_value

* add useful cleanup internal function to  zonecfg

* zonecfg - cleaned up _parse_value, added _sanitize_value and _dump_cfg for debugging

* zone.absent - uninstall would sometimes not do the right thing. some work on zone.present

* zone.present implemented path for when config does not yet exist

* zone.present supports updating properties

* zonecfg should support resources that do not have selectors

* zonecfg should also debug log remove_resource its config

* zone.present - implemented, after 2 refactors

* Finish documentation
 2017-02-03 10:05:02 -07:00
rallytime
6504bb6b02 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/modules/pillar.py
  - salt/states/archive.py
  - tests/integration/states/archive.py
 2017-02-03 09:48:58 -07:00
Daniel Wallace
da3053ea9b update vmware getting started doc (#39146) 
The IDE entry needs to be a dictionary entry.  Without this, it is seen
as a string.  This is probably done this way so that in the future,
configurations can be added to the IDE device.
 2017-02-03 09:00:00 -07:00
Mike Place
56cb200cf8 Merge pull request #39027 from cloudflare/REDIS-CACHE 
Redis cache plugin
 2017-02-02 13:27:26 -07:00
C. R. Oldham
8e6c155ead MANY dunder variable fixes for proxies + proxy keepalive from @mirceaulinic (#38829) 
* Add proxy keep alive options

* Documentation for the alive function

* MANY dunder variable fixes for proxies.

* Lint.

* Lint.

* More Lint.
 2017-02-02 11:35:40 -07:00
rallytime
a6fdfcb4fa Fix some spelling errors and remove unecessary doc modules 2017-02-02 10:12:58 -07:00
rallytime
d398c5f7ee Update autodoc topics for new modules added in develop 
Also adjusted versionadded tags as necessary on the files that
are getting new autodoc files added.
 2017-02-02 10:12:58 -07:00
Ivan Babrou
6ffeda3ee5 Clarify ipv6 option for minion and inteface for master, closes #39118 (#39131) 
* Clarify ipv6 option for minion and inteface for master, closes #39118

* Add ipv6 reference
 2017-02-02 08:35:00 -07:00
rallytime
eb61788f87 Merge branch '2016.11' into 'develop' 
Conflicts:
  - doc/ref/runners/all/index.rst
  - salt/modules/win_lgpo.py
  - salt/states/dockerio.py
 2017-02-01 16:36:45 -07:00
Mircea Ulinic
06c8899e20 do instead of set 2017-02-01 23:11:56 +00:00
Mircea Ulinic
60b6caa502 Jinja topic doc: logs subsection 2017-02-01 23:11:56 +00:00
Mircea Ulinic
c051f7ae7b BGP runner doc 2017-02-01 18:17:19 +00:00
rallytime
b866427f59 Add a bunch of missing doc module references 
Also added an index.rst file for executors, renamed the
azurearm.rst file (Was misspelled with "azureare"), and
removed the xbps-pkg.rst file since that is an invalid
reference.
 2017-01-31 15:12:34 -07:00
Erik Johnson
aa6bd51b6b Add Pillar Decryption info to Nitrogen release notes 2017-01-31 11:25:58 -06:00
Erik Johnson
18a58b2b63 Document pillar decryption feature in pillar docs 2017-01-31 11:25:58 -06:00
Erik Johnson
dec7cbf9c5 Add documentation on pillar decryption config items 2017-01-31 11:25:56 -06:00
rallytime
0e5fa1b8ae Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/modules/vsphere.py
 2017-01-31 08:57:44 -07:00
rallytime
b2b3989773 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/engines/__init__.py
  - salt/loader.py
 2017-01-30 16:58:31 -07:00
rallytime
b732a1f646 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2017-01-30 16:45:16 -07:00
Nicole Thomas
56ccae6ff7 Add 2015.8.14 release notes file (#39046) 2017-01-30 16:44:00 -07:00
Nicole Thomas
fef1b1133d Add 2016.3.6 release notes file (#39045) 2017-01-30 16:43:50 -07:00
Nicole Thomas
0943872fab Add 2016.11.3 release notes file (#39044) 2017-01-30 16:43:40 -07:00
Nicole Thomas
7c43f4ac32 [2016.3] Update release numbers for doc build (#39042) 2017-01-30 15:52:33 -07:00
Nicole Thomas
11a99d8be0 [develop] Update release numbers for doc build (#39041) 2017-01-30 15:51:40 -07:00
Nicole Thomas
27081d6520 [2016.11] Update release numbers for doc build (#39040) 2017-01-30 15:51:09 -07:00
Nicole Thomas
424e68436e Update 2016.11.2 release notes (#39039) 2017-01-30 15:40:00 -07:00
Nicole Thomas
ff324599d5 Update 2016.3.5 release notes (#39038) 2017-01-30 15:39:47 -07:00
Nicole Thomas
5943fe65d3 Update 2015.8.13 release notes (#39037) 2017-01-30 15:39:33 -07:00
Nicole Thomas
7fa89303a1 Merge pull request #39026 from rallytime/merge-develop 
[develop] Merge forward from 2016.11 to develop
 2017-01-30 10:39:18 -07:00
Julien BONACHERA
1e06f388bb make openvswitch state work with python3 (#38873) 
* openvswitch: add a basic unit test for openvswitch

* openvswitch: enclose comments_* variables into a map

* openvswitch: only prepare error messages if type parameter is present

* openvswitch: add test case: create a GRE port

* openvswitch: remove trailing whitespace

* openvswitch: add missing "comments" variable

* openvswitch: pep8 compliance

* openvswitch: mock dig.check_ip

* openvswitch: rename "type" argument into "tunnel_type"

* openvswitch: reference bridge_exists before assignment

* openvswitch: reference port_list before assignment

* openvswitch: add upgrade note about "type" option renaming
 2017-01-30 09:56:10 -07:00
Mircea Ulinic
570adea118 Redis cache doc 2017-01-30 16:24:04 +00:00
rallytime
8928436bdd Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/pillar/__init__.py
 2017-01-30 09:06:27 -07:00
rallytime
76e95087fd Merge branch '2016.3' into '2016.11' 
No conflicts.
 2017-01-27 11:52:03 -07:00
Mike Place
cfdbc99e12 Merge pull request #38989 from alprs/docfix-state_pt3_environ 
Documentation: fix SLS in environment variable examples
 2017-01-27 10:00:07 -07:00
Jason Pack
cb44161eb6 Merge branch 'develop' of https://github.com/spidercensus/salt into develop 
Conflict was salt/proxy/junos.py
 2017-01-27 09:52:42 -05:00
Jason Pack
45268d6d56 Merge branch 'patch-2' of https://github.com/spidercensus/salt into develop 2017-01-27 09:46:55 -05:00
Andreas Lutro
52a9ad1c60 fix SLS in environment variable examples 2017-01-27 11:19:04 +01:00
rallytime
e91fcbeaac Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/minion.py
  - salt/modules/dockerng.py
  - salt/thorium/key.py
 2017-01-26 16:02:06 -07:00
rallytime
fdaa5ac1b0 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/master.py
  - salt/pillar/__init__.py
  - salt/utils/__init__.py
 2017-01-26 14:09:37 -07:00
Mike Place
664748e959 Add documentation release note for change in system module (#38975) 
Refs #38968
 2017-01-26 12:09:17 -07:00
Markus
7ff098426d comments on version number and git (#38961) 2017-01-26 09:21:16 -07:00
Erik Johnson
6b014e53fc Rename on_demand_pillar to on_demand_ext_pillar 2017-01-25 15:08:57 -06:00
Erik Johnson
d216f90c63 Document new on_demand_pillar option and add to config template 2017-01-25 14:43:14 -06:00
Mike Place
f9b2719ed3 Merge pull request #38942 from cloudflare/NET-RUNNER 
New runner: net finder
 2017-01-25 13:21:27 -07:00
Mike Place
e420763285 Merge pull request #38944 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2017-01-25 12:44:42 -07:00
Mike Place
f94b8798b6 Merge pull request #38918 from thatch45/thorium_typos 
Thorium typos
 2017-01-25 12:00:40 -07:00
rallytime
49f57ba3f1 Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/utils/win_functions.py
 2017-01-25 09:59:29 -07:00
rallytime
ee33a53a64 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/modules/dockerng.py
  - tests/unit/doc_test.py
 2017-01-25 09:43:12 -07:00
Mircea Ulinic
317fb48ec7 net runner doc 2017-01-25 15:54:45 +00:00
Robert James Hernandez
9cc9c6110d Adding explicit call to python-systemd in jessie-backports 2017-01-24 14:25:45 -08:00
Thomas S Hatch
0b4aca9145 fix some minor typos in the thorium docs 2017-01-24 10:05:23 -07:00
Erik Johnson
42a3652620 Add top file merging docs to the master config file documentation 
Also put the top file stuff in its own section of the minion config
file, along with a message explaining that these options are only used
in masterless salt.
 2017-01-23 20:38:03 -06:00
Megan Wilhite
2786e209c6 add 2016.11.2 changelog to release notes (#38848) 2017-01-20 15:32:45 -07:00
Nicole Thomas
1262fa8ef8 Merge pull request #38843 from rallytime/merge-develop 
[develop] Merge forward from 2016.11 to develop
 2017-01-20 14:01:12 -07:00
Mike Place
5d126a2772 Merge pull request #38828 from eradman/pillarenv 
Extend support for pillarenv_from_saltenv to master config
 2017-01-20 12:15:02 -07:00
rallytime
3f74d697b9 Merge branch '2016.11' into 'develop' 
Conflicts:
  - pkg/windows/build_pkg.bat
  - salt/modules/archive.py
 2017-01-20 12:07:19 -07:00
Nicole Thomas
a275b9714e Merge pull request #38815 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2017-01-20 11:53:00 -07:00
David Boucha
1d13dd971e add info about what is cached 2017-01-19 16:56:40 -07:00
David Boucha
6a07a8de00 fix config example 2017-01-19 15:56:40 -07:00
David Boucha
a643340632 Add documentation for the Minion data cache 
Includes docs for localfs and consul minion data cache modules
 2017-01-19 15:53:22 -07:00
Ch3LL
31f324c4ff add 2016.3.5 changelog to release notes 2017-01-19 15:43:28 -07:00
Eric Radman
9b5d28df0c Extend support for pillarenv_from_saltenv to master config 
`pillarenv_from_saltenv` is already an option for minion config, this
change enables this feature on the master.

If set to `true` salt will derive the pillar environment set on the
master:

$ salt-run pillar.show_pillar saltenv=radman
my_passphrase:
    XYZ

$ sudo salt-run pillar.show_pillar saltenv=radman2
my_passphrase:
    ABC
 2017-01-19 13:34:33 -05:00
rallytime
315b2c8712 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/modules/win_system.py
  - tests/unit/modules/win_system_test.py
 2017-01-18 14:16:45 -07:00
David Boucha
dbe9edb806 fix reactor example. 
This version is tested on 2016.11 branch and was found working
ZD 1035
 2017-01-18 11:46:34 -07:00
Mircea Ulinic
c6078a751d Custom Jinja filters paragraph 2017-01-18 15:01:05 +00:00
Mircea Ulinic
3ccda08439 More doc for Jinja util filters 
Fix indent
 2017-01-18 15:01:05 +00:00
Mircea Ulinic
d743aff755 Document util filters 2017-01-18 15:01:05 +00:00
SaltyCharles
e127013892 update gitfs.rst for clarity 
Add note for "Unsupported URL Protocol" error when using pygit2 without libssh2.
 2017-01-17 15:44:00 -08:00
rallytime
1e125e2844 Update pillar tutorial lanuage regarding pillar_opts settings 
The pillar_opts option defaults to ``False``. This change updates
the language in the pillar tutoral to be in-line with the default
setting.

Fixes #38629
 2017-01-17 14:55:17 -07:00
rallytime
64d866f7ab Merge branch '2016.3' into '2016.11' 
No conflicts.
 2017-01-17 11:44:26 -07:00
rallytime
5b43a252c9 Merge branch '2016.11' into 'develop' 
Conflicts:
  - conf/master
  - doc/topics/installation/ubuntu.rst
  - salt/modules/pillar.py
  - salt/netapi/rest_tornado/saltnado.py
  - salt/states/influxdb_user.py
  - salt/utils/minions.py
  - salt/utils/openstack/nova.py
 2017-01-17 09:50:06 -07:00
Denys Havrysh
4620dc4afa DOCS: add C++ compiler installation on RHEL required for bundled 0mq 2017-01-17 15:02:31 +02:00
rallytime
30e8a66fb0 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/netapi/rest_tornado/saltnado.py
  - tests/integration/netapi/rest_tornado/test_app.py
 2017-01-16 18:54:14 -07:00
Eric Radman
17fc12175c Try to resolve guest IP if VMware Tools is not installed 
In some cases installation of VMware Tools is not possible. Enable
salt-cloud to bootstrap a minion by using DNS to resolve it's IP.
 2017-01-15 22:42:53 -05:00
rallytime
d24776f5e9 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - conf/master
  - doc/topics/netapi/index.rst
  - salt/netapi/__init__.py
 2017-01-15 16:07:55 -07:00
Mike Place
909bb15873 Merge pull request #38673 from kyrias/por_doc 
ref/configuration/master: Document ping_on_rotate
 2017-01-15 11:01:18 -07:00
Mike Place
0ad5d22ad4 Merge pull request #38703 from yhekma/docfix 
The `test` option is only valid for the minion, not the master
 2017-01-15 10:56:22 -07:00
Mike Place
ffae20ee58 Merge pull request #38686 from cloudflare/STATUSPAGE-STATE 
New state: statuspage
 2017-01-15 07:51:35 -07:00
Mike Place
f4233bb18d Merge pull request #38739 from vutny/fix-runtests-doc 
DOCS: correct examples of running test suite
 2017-01-15 07:35:47 -07:00
Denys Havrysh
b872bb63f6 DOCS: correct examples of running test suite 2017-01-15 11:48:04 +02:00
Denys Havrysh
51d4707071 DOCS: add links to File State Backups page where necessary (#38735) 2017-01-14 11:49:21 -07:00
Zac Brachmanis
7ca256ccee Minor spelling correction (#38721) 2017-01-13 14:57:20 -07:00
Sébastien Santoro
6d3717b9ee Proofread jinja_to_execution_module tutorial (#38720) 2017-01-13 14:53:50 -07:00
rallytime
4e1e45d640 Merge branch '2016.3' into '2016.11' 
No conflicts.
 2017-01-13 14:45:36 -07:00
rallytime
b910499dbe Various follow up fixes 
Merge branch '2015.8.12_follow_up' into '2015.8'
 2017-01-13 14:40:17 -07:00
Yoram Hekma
57df3bf148 The test option is only valid for the minion, not the master 2017-01-12 09:13:46 +01:00
Mircea Ulinic
5cf9c3e205
Statuspage state doc 2017-01-11 14:06:58 +00:00
Johannes Löthberg
2ac3da8d03 ref/configuration/master: Document ping_on_rotate 
Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
 2017-01-10 23:01:06 +01:00
rallytime
30429b2e44 Remove the installation instructions for out-of-date community ppa 
These packages are not being updated and it is causing confusion.

Ubuntu packages should be installed with the instructions on
repo.saltstack.com.
 2017-01-09 17:13:50 -07:00
rallytime
e8309a6bbf Add release notes for 2015.8.13 2017-01-09 14:25:31 -07:00
rallytime
d4f8f4ca7a Merge branch '2016.11' into 'develop' 
No conflicts.
 2017-01-09 11:57:28 -07:00
rallytime
34282322c0 Clean up tests and docs for batch execution 
Batch execution was removed from NetapiClient and Saltnado in
previous commits. This change is a follow up that removes related
test cases and doc references.
 2017-01-09 11:29:34 -07:00
Mike Place
993596b10a Merge pull request #38218 from rallytime/cmd-run-alias-deprecation 
Remove support for aliasing cmd.run to cmd.shell
 2017-01-06 14:36:18 -07:00
Mike Place
791499c813 Merge pull request #38620 from rallytime/merge-develop 
[develop] Merge forward from 2016.11 to develop
 2017-01-06 10:50:58 -07:00
Mike Place
e2c8f7a844 Merge pull request #38588 from cloudflare/STATUSPAGE-MOD 
New execution module: statuspage
 2017-01-06 10:29:13 -07:00
rallytime
87af1f1e5a Remove support for aliasing cmd.run to cmd.shell 2017-01-06 11:46:47 -05:00
rallytime
342a5ac0b8 Merge branch '2016.11' into 'develop' 
No conflicts.
 2017-01-06 10:31:51 -05:00
Super-User
fbdd32f46b add note related to issue #37027 2017-01-06 15:25:51 +01:00
Mike Place
6646a95c1e Merge pull request #38490 from eradman/cloud_config 
Change map and profile extends merge strategy to use recursive update
 2017-01-05 16:35:41 -07:00
Mircea Ulinic
515c6643c9
StatusPage module doc 2017-01-05 18:02:13 +00:00
rallytime
30f14d15df Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/config/__init__.py
  - salt/engines/slack.py
 2017-01-04 16:54:58 -05:00
Mike Place
7b74436d13 Merge pull request #38562 from rallytime/arch-install-docs 
Update arch installation docs with correct package name
 2017-01-04 13:04:27 -07:00
Mike Place
4723d26105 Merge pull request #38564 from rdutch/update_orchestration_docs 
Update orchestration docs with runner explanation.
 2017-01-04 12:56:34 -07:00
Eric Radman
3ec910cf34 Change map and profile extends merge strategy to use recursive update 
Previously only top-level data elements could be overridden in a map or
extended profile entry. This change adjusts map and profile evaluation
to use a recursive merge using salt.utils.dictupdate.update().

This is a break with compatibility, but in the common case a cloud
profile or map is not structured to truncate configuration but to add
further detail to the profile that it extends.

Update map docs with an example from VMware where we chan now change a
network parameter without having to repeat other device information such
as disk controllers.
 2017-01-04 14:11:53 -05:00
Mike Place
b1e21ed58d Merge pull request #38516 from Inveracity/patch-2 
include option for freeipa
 2017-01-04 11:54:59 -07:00
Hilberding, Rob
f83cc2993c Update orchestration docs with runner explanation. 2017-01-04 13:34:55 -05:00
rallytime
8b1897ace9 Update arch installation docs with correct package name 
When 2016.11.0 was released, the naming of the salt package was
changed. The salt-zmq version is now named just "salt" and the
salt-raet pacakge is no longer being updated.
 2017-01-04 13:08:47 -05:00
David Boucha
4ddbc2ecaa add note about pyVmomi locale workaround (#38536) 2017-01-04 09:24:04 -05:00
rallytime
9ad362fbde Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/states/kapacitor.py
 2017-01-03 10:17:18 -05:00
Inveracity
f1c6fc30d1 include option for freeipa 
Updating docs to include freeipa per merge request #37219
 2017-01-02 14:15:42 +01:00
twangboy
e96bfe8fa2 Change OSX/OS X to macOS where possible 2016-12-28 14:49:46 -07:00
Dirk Heinrichs
362448789c Fix documentation reg. pkg.available_version. 2016-12-27 19:15:55 +01:00
Mike Place
acedf3e95b Merge pull request #38413 from eradman/map_docs 
Provide an example for overriding nested parameters in a map file
 2016-12-27 09:24:17 -07:00
Mike Place
34621930aa Merge pull request #38420 from rallytime/module-deprecations 
Removed various deprecation notices from salt/modules/* files
 2016-12-27 09:09:58 -07:00
Erik Johnson
4cbfa9d947 Add pillarenv_from_saltenv to pillar docs 2016-12-22 16:25:29 -06:00
rallytime
a2927226ea Merge branch '2016.11' into 'develop' 
Conflicts:
  - doc/ref/modules/all/salt.modules.napalm_route.rst
  - doc/ref/modules/all/salt.modules.napalm_snmp.rst
  - doc/ref/modules/all/salt.modules.napalm_users.rst
  - doc/ref/states/all/salt.states.netsnmp.rst
  - doc/ref/states/all/salt.states.netusers.rst
  - salt/states/cron.py
 2016-12-22 12:15:06 -07:00