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
rallytime
0a27f941f7
Removed various deprecation notices from salt/modules/* files
...
Added docs to the release notes for all of these changes.
The affected modules are:
- htpasswd
- img
- smartos_virt
- virt
- virtualenc_mod
- xapi
- zypper
2016-12-22 11:57:26 -07:00
rallytime
efb8a8ddf5
Merge branch '2016.3' into '2016.11'
...
Conflicts:
- doc/ref/configuration/minion.rst
- salt/config/__init__.py
- salt/minion.py
2016-12-22 10:39:14 -07:00
Erik Johnson
27253522c8
Improve pillar documentation ( #38407 )
...
* rename anchor
* Move pillar cache config option to different section, add an anchor
* Add links to master and minion config items
* Add documentation for pillar.item's "delimiter" argument
* Improve pillar documentation
This improves RST formatting, adding hyperlinks as well as adding
information on the difference between in-minion pillar data and
pillar data that is compiled on-demand.
* Add section on how pillar environments are handled
2016-12-22 10:32:37 -07:00
Mike Place
16f35244f8
Merge pull request #38378 from rallytime/git-deprecations
...
Remove functions and arguments in git state and execution module
2016-12-22 09:47:10 -07:00
Mike Place
d10e3ece5a
Merge pull request #38404 from terminalmage/pillarenv
...
Add config option to pin pillarenv to effective saltenv
2016-12-22 09:34:19 -07:00
Eric Radman
d0507375b9
Provide an example for overriding nested parameters in a map
...
At first reading it appears that that any data element can be specified
individually in a map, but this is not the case. Under the hood, the map file is
merged with the profile configuration using dict.update().
Employ the term 'top level data element' from
https://github.com/saltstack/salt/issues/23416
2016-12-22 10:22:22 -05:00
Erik Johnson
4049bf7288
Add pillarenv_from_saltenv to Nitrogen release notes
2016-12-21 19:54:48 -06:00
Erik Johnson
1fd9c716d9
Add pillarenv_from_saltenv minion config parameter
2016-12-21 19:49:32 -06:00
Mike Place
4d05dc5337
Merge pull request #38396 from gtmanfred/develop
...
add travisci module
2016-12-21 14:01:37 -07:00
rallytime
09a76a0a97
Remove functions and arguments in git state and execution module
...
These were all marked for removal in Nitrogen
2016-12-21 11:55:18 -07:00
Daniel Wallace
05574d4770
add travisci module
...
Used to verify webhook post requests came from travis
2016-12-21 12:42:09 -06:00
Mike Place
a21354dff1
Merge pull request #38379 from rallytime/event-utils-deprecations
...
Remove use_pending and pending_tags from salt.utils.event.get_event function
2016-12-21 11:26:48 -07:00
Mike Place
5b6e31d6fc
Merge pull request #38380 from rallytime/glusterfs-deprecations
...
Remove deprecated functions from glusterfs state and module
2016-12-21 11:25:47 -07:00
Seth House
cad64a9264
Remove retrieving roles from nodegroups from docs as anti-pattern
2016-12-20 22:43:56 -07:00
rallytime
7ecd4e6e1b
Remove deprecated functions from glusterfs state and module
2016-12-20 15:09:54 -07:00
rallytime
efc5378f3d
Remove use_pending and pending_tags from salt.utils.event.get_event function
2016-12-20 15:01:40 -07:00
Mike Place
a9c2618c89
Merge pull request #38360 from rallytime/deprecate-apache-states
...
Remove enable/disable funcs from apache_* states
2016-12-20 13:37:14 -07:00
Mike Place
68430b1fa6
Merge pull request #38348 from rallytime/mod-docs-2016.11
...
Update autodoc topics for new modules added in 2016.11
2016-12-20 13:36:20 -07:00
rallytime
b31c2412ca
Add __iter__ and next options to doc/conf.py
...
This allows sphinx to build without autodoc errors on mock objects
that should be iterable.
Also added versionadded tags to the snapper module and state.
2016-12-20 11:50:43 -07:00
rallytime
494a06bee2
Merge branch '2016.11' into 'develop'
...
Conflicts:
- doc/ref/configuration/minion.rst
2016-12-20 10:03:44 -07:00
Dmitry Kuzmenko
dad748f57a
Data cache plugin configuration documentation.
2016-12-20 19:32:48 +03:00
Mike Place
662d8d64a8
Merge pull request #38166 from rallytime/cloud-deprecations
...
Remove support for "provider" in cloud provider configs
2016-12-20 08:06:19 -07:00
Mike Place
9cd7b72442
Merge pull request #38359 from rallytime/remove-PidfileMixin
...
Remove PidfileMixin as it is deprecated for removal in Nitrogen
2016-12-20 06:48:20 -07:00
Mike Place
9350808fea
Merge pull request #38361 from rallytime/deprecate-client_acl-client_acl_blacklist
...
Remove support for client_acl and client_acl_blacklist
2016-12-20 06:33:23 -07:00
rallytime
a9f85f0dbe
Remove support for client_acl and client_acl_blacklist
...
These have been deprecated for some time and were marked for
removal in Nitrogen.
publisher_acl and publisher_acl_blacklist should be used instead.
2016-12-19 16:18:48 -07:00
rallytime
baf8f208eb
Remove dup LXC doc reference
2016-12-19 15:49:37 -07:00
rallytime
810ed4a9cd
Remove enable/disable funcs from apache_* states
...
The apache_*.enable and apache_*.disable state functions are
deprecated in favor of apache_*.enabled and apache_*.disabled.
2016-12-19 15:42:39 -07:00
rallytime
279cec88da
Remove PidfileMixin as it is deprecated for removal in Nitrogen
2016-12-19 15:32:22 -07:00
rallytime
c6e191ad0d
Remove doc markup references from 2016.11 branch
2016-12-19 15:14:37 -07:00
rallytime
513058945c
Merge branch '2016.3' into '2016.11'
...
Conflicts:
- doc/ref/states/requisites.rst
- doc/topics/cloud/profitbricks.rst
- doc/topics/cloud/vsphere.rst
- doc/topics/releases/0.9.8.rst
- doc/topics/releases/releasecandidate.rst
- salt/cloud/clouds/vsphere.py
- salt/minion.py
- salt/states/archive.py
- tests/unit/states/archive_test.py
2016-12-19 14:58:39 -07:00
rallytime
8f80916432
Merge branch '2016.11' into 'develop'
...
Conflicts:
- doc/ref/configuration/master.rst
- doc/topics/cloud/index.rst
- salt/states/cron.py
2016-12-19 14:00:52 -07:00
rallytime
366271f459
Add snapper to state index doc module list
2016-12-19 10:32:44 -07:00
rallytime
135d254c80
Remove netapi autodoc files: they should not be added as their doc structure is different
2016-12-19 17:00:20 +00:00
rallytime
0006139aca
Update autodoc topics for new modules added in 2016.11
2016-12-19 16:44:34 +00:00
Mike Place
86c53b8efd
Merge pull request #38172 from rallytime/win-deprecations
...
Remove support for deprecation options/functions in win* files
2016-12-19 07:33:05 -07:00
Mike Place
c83db5a785
Merge pull request #38320 from rallytime/cleanup-doc-refs
...
Cleanup doc internal markup references
2016-12-18 05:31:27 -07:00
Mike Place
ebb9f6cbbc
Merge pull request #38323 from rallytime/update-cloud-provider-links
...
Update the Cloud Provider Specifics links in cloud docs
2016-12-18 05:30:48 -07:00
rallytime
5940db5b3f
Merge branch '2016.3' into '2016.11'
...
No conflict.
2016-12-16 15:25:08 -07:00
rallytime
022caf23e9
Update the Cloud Provider Specifics links in cloud docs
...
- Reordered some to be alphabetical
- Added Azure Arm
- Added Dimension Data
2016-12-16 15:19:45 -07:00
Nicole Thomas
9e35f5dd08
Add azurearm module to doc index ( #38322 )
2016-12-16 14:44:20 -07:00
Mike Place
e937fa44e1
Merge pull request #38315 from sjorge/develop-zonecfg
...
zonecfg module for Solaris 10 and compatible
2016-12-16 12:08:00 -07:00
rallytime
05ec9f4b5b
Merge branch '2016.11' into 'develop'
...
Conflicts:
- salt/netapi/rest_cherrypy/app.py
2016-12-15 20:47:35 -07:00
rallytime
5c42a361a0
Remove ":doc:" references from all doc/topics/installation/* files
2016-12-15 16:50:16 -07:00
rallytime
23bce1c929
Remove ":doc:" references from all doc/topics/releases/* files
2016-12-15 16:45:51 -07:00
rallytime
4aafa41d22
Remove ":doc:" references from a bunch of doc/* files
2016-12-15 16:09:27 -07:00