valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
88,277 Commits 24 Branches 182 Tags 341 MiB
f7d182871e
Commit Graph

2441 Commits

Author SHA1 Message Date
David Boucha
5eb27571a0 Correct doc to actually blacklist a module 2017-05-24 17:22:36 -06:00
Andreas Tsaridas
38acbb2480 add dashes 2017-05-24 18:16:54 +02:00
rallytime
d2d9a3d29f Merge branch '2016.3' into '2016.11' 
Conflicts:
  - doc/ref/cli/salt-cp.rst
  - salt/config/__init__.py
 2017-05-23 15:58:14 -06:00
rallytime
2ba9f644f6 Merge branch 'nitrogen' into 'develop' 
No conflicts.
 2017-05-20 17:08:39 -06:00
Andreas Tsaridas
e7d183b8a5 - minion_id_lowercase 2017-05-20 15:10:25 +02:00
Mike Place
8386d10b4b Merge pull request #41192 from DSRCorporation/features/executors_redesign_doc 
Executors redesign and documentation
 2017-05-18 10:42:20 -05:00
Mike Place
051259d469 Merge pull request #41218 from gtmanfred/roster 
allow for syncing salt-ssh rosters on the master
 2017-05-17 14:21:25 -05:00
rallytime
2690a36cb8 Remove doc ref files for search runner 
The search runner and related code was removed in #41245
 2017-05-15 16:48:21 -06:00
Dmitry Kuzmenko
7a8b644da7 Executors documentation. 2017-05-15 11:41:00 +03:00
Seth House
f1dc63f16c Add performance expectations and recommendations to rest_cherrypy docs 2017-05-12 17:57:32 -06:00
Erik Johnson
10dc695cc4 Make salt-cp work with larger files 
This breaks the files into chunks to keep them from exceeding the max size
of a published command. It also adds recursion, allowing for entire
directories to be transmitted. Finally, it adds gzip compression, and
a "-n" flag to disable use of compression.
 2017-05-12 15:13:28 -05:00
Daniel Wallace
836ee32ff6 allow for syncing salt-ssh rosters on the master 2017-05-12 13:36:46 -06:00
Seth House
e61b83c09e Move the local TOC up since it's such a large docstring 2017-05-12 12:03:26 -06:00
rallytime
d510583bb5 Remove blockdev execution module 
All of the functions in the blockdev execution module have been
moved over to the disk execution module. These functions were
slated for removal in the Oxygen release.
 2017-05-11 14:13:42 -06:00
rallytime
4100e2b6a6 Merge branch 'nitrogen' into 'develop' 
No conflicts.
 2017-05-10 15:32:33 -06:00
Nicole Thomas
ac5bda8839 Merge pull request #41117 from terminalmage/rename_env_blacklist_whitelist 
Rename the *_env_blacklist config opts to *_saltenv_blacklist
 2017-05-10 14:03:23 -06:00
rallytime
ef0df4a954 Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - salt/modules/win_network.py
  - salt/modules/win_pkg.py
  - salt/utils/gitfs.py
  - tests/unit/modules/test_win_network.py
  - tests/unit/states/test_file.py
 2017-05-09 14:32:49 -06:00
rallytime
4c099df8fa Merge branch 'nitrogen' into 'develop' 
No conflicts.
 2017-05-09 11:27:55 -06:00
Daniel Wallace
c038727a80 document clouds dynamic directory 2017-05-07 20:30:20 -06:00
Erik Johnson
59737a34a5 Rename the *_env_blacklist config opts to *_saltenv_blacklist 
These were overlooked a while back when we deprecated env in favor of
saltenv.
 2017-05-06 23:11:33 -05:00
Erik Johnson
8c6410e3cd Add notices about ssl_verify only working in 0.23.2 and newer 2017-05-05 17:04:23 -05:00
rallytime
01a012bbdf Merge branch 'nitrogen' into 'develop' 
No conflicts.
 2017-05-05 10:12:18 -06:00
rallytime
319dc45c1d Merge branch 'nitrogen' into 'develop' 
Conflicts:
  - salt/runners/saltutil.py
 2017-05-04 11:51:32 -06:00
rallytime
c91bb18298 Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - doc/ref/configuration/master.rst
  - salt/modules/pip.py
  - salt/states/saltmod.py
 2017-05-04 11:49:33 -06:00
Nicole Thomas
2b47b7bec6 Merge pull request #41045 from terminalmage/clarify-gitfs-docs 
Clarify gitfs docs
 2017-05-03 16:24:54 -06:00
Erik Johnson
c757eda331 Clarify gitfs docs 
This improves cross links to the per-remote docs from the master config
file documentation.
 2017-05-03 13:34:56 -05:00
Mike Place
bd151ff49b Merge pull request #41004 from corywright/implement-file-auth 
Add salt.auth.file module for simple file based authentication
 2017-05-03 10:54:24 -06:00
rallytime
19a3ecd5b8 Merge branch '2016.11' into 'nitrogen' 
No conflicts.
 2017-05-03 09:59:09 -06:00
rallytime
fc756c595c Merge branch '2016.3' into '2016.11' 
Conflicts:
  - doc/ref/configuration/master.rst
  - salt/config/__init__.py
 2017-05-02 12:52:59 -06:00
Mike Place
cc71347a7c Merge pull request #40973 from tonybaloney/libcloud_compute 
Introduce `libcloud_compute` execution module for Libcloud compute APIs
 2017-05-02 10:03:42 -06:00
Cory Wright
9e17ad28eb Add salt.auth.file module for simple file based authentication 2017-05-02 10:26:57 -04:00
Mike Place
42967eab99 Merge pull request #40893 from tonybaloney/libcloud_state 
Improvements to libcloud modules
 2017-05-01 13:58:25 -06:00
rallytime
a9fb83c28c Merge branch 'nitrogen' into 'develop' 
No conflicts.
 2017-05-01 10:43:45 -06:00
Anthony Shaw
4fce227190
update the tutorials and docs 2017-04-30 20:32:44 +10:00
Anthony Shaw
e92a7ba660 Merge branch 'develop' into libcloud_state 2017-04-29 07:43:28 +10:00
rallytime
a69cd74f75 Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - salt/cloud/clouds/nova.py
  - salt/spm/__init__.py
 2017-04-28 09:23:42 -06:00
Mike Place
909d519ddb Merge pull request #40751 from rallytime/fix-39531 
Use Salt's SaltYamlSafeLoader and SafeOrderedDumper classes for yaml.load/dump
 2017-04-28 06:56:05 -06:00
rallytime
a876bcdb8a Merge branch 'nitrogen' into 'develop' 
No conflicts.
 2017-04-27 10:37:05 -06:00
Cory Wright
2995a05c2b Make salt.auth.rest heading consistent with all other salt.auth documentation 2017-04-27 09:32:53 -04:00
Mike Place
7a63e3cfd2 Merge pull request #40668 from grep4linux/new_xen_cloud_driver 
new Xen cloud driver
 2017-04-26 10:59:38 -06:00
Anthony Shaw
e384754cb3
tutorial for the libcloud modules 2017-04-26 15:09:08 +10:00
Anthony Shaw
74b955004b
add docs for new state modules 2017-04-25 21:32:13 +10:00
Anthony Shaw
27b8849ede
add existing libcloud modules to doc index 2017-04-25 17:17:18 +10:00
rallytime
5372f25fde Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - salt/cloud/clouds/rackspace.py
  - tests/unit/cloud/clouds/test_dimensiondata.py
 2017-04-24 15:35:28 -06:00
Anthony Shaw
39c094487d
add a doc page for the state module 2017-04-24 19:17:39 +10:00
Anthony Shaw
e02e27ba68
add doc page 2017-04-24 18:13:47 +10:00
Mike Place
26f5482576 Merge pull request #40809 from gtmanfred/develop 
Add zookeeper managing module and state
 2017-04-21 12:04:25 -06:00
Nicole Thomas
a153f5c204 Merge pull request #40783 from xetus-oss/feature-40755 
Add state.orch_show_sls to the state runner
 2017-04-21 09:45:35 -06:00
Daniel Wallace
b60a8d013a remove rackspace from index 2017-04-21 09:23:05 -06:00
Daniel Wallace
559aa1d8b6 remove deprecated firstgen rackspace cloud driver 2017-04-21 08:59:56 -06:00
Daniel Wallace
0b70e9405f add zookeeper module and state 
Also use __context__ in zk_conncurrency
 2017-04-20 17:56:05 -06:00
Terence Kent
f9cd187631 Add support for performing a state.show_sls for the state runner module. This is a very useful feature when writing orchestrate SLS files. 2017-04-19 16:34:06 -07:00
Enquier
b81856e370 Reordering Write Returners documentation 2017-04-19 14:49:28 -06:00
rallytime
6493880bde Merge branch '2016.11' into 'nitrogen' 
No conflicts.
 2017-04-18 16:42:30 -06:00
rallytime
62c4d37c2f Use salt.utils.yamlloader with SaltYamlSafeLoader as the Loader with yaml.load 2017-04-18 13:41:07 -06:00
Mike Place
785e6060a9 Add requested docs 2017-04-18 08:34:56 -06:00
C. R. Oldham
65ea8997b7 Add allow_minion_key_revoke config option 2017-04-17 13:20:45 -06:00
Nicole Thomas
88f514835d Merge pull request #40677 from rallytime/merge-develop 
[develop] Merge forward from nitrogen to develop
 2017-04-13 13:19:07 -06:00
Mike Place
5668cc39de Merge pull request #39802 from cachedout/random_startup_delay 
A random startup delay option for minions
 2017-04-13 09:53:06 -06:00
rallytime
5282ea2480 Merge branch 'nitrogen' into 'develop' 
No conflicts.
 2017-04-13 09:46:05 -06:00
Raine Curtis
87035e0651 new Xen cloud driver 2017-04-12 14:52:07 -06:00
rallytime
749840ce5f Merge branch 'nitrogen' into 'develop' 
No conflicts.
 2017-04-11 15:11:46 -06:00
rallytime
e90622bc22 Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - salt/modules/dockermod.py
  - salt/modules/file.py
 2017-04-11 15:03:34 -06:00
Nicole Thomas
4beb7b4e77 Merge pull request #40644 from rallytime/nitrogen-doc-update 
Add autodoc modules for new files in nitrogen
 2017-04-11 14:59:26 -06:00
rallytime
3a232ffe8b Add autodoc modules for new files in nitrogen 2017-04-11 19:31:33 +00:00
Mike Place
523918c4a8 Merge pull request #40599 from sjorge/logadm-state 
Logadm state
 2017-04-10 16:35:57 -06:00
Daniel Wallace
a86b101ae6 add retries on authentications of the salt minion reconnecting 2017-04-10 14:53:26 -06:00
rallytime
2cd0c5e4ec Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - doc/topics/cloud/azurearm.rst
  - salt/cloud/clouds/vultrpy.py
  - salt/modules/aptpkg.py
  - salt/modules/dockermod.py
  - tests/unit/modules/dockerng_test.py
  - tests/unit/modules/test_pillar.py
 2017-04-10 14:09:25 -06:00
Super-User
cf2898fbdb generate docs for salt.states.logadm 2017-04-09 15:44:18 +02:00
rallytime
4a75675d07 Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - doc/topics/cloud/azurearm.rst
  - salt/modules/aptpkg.py
  - salt/modules/dockermod.py
  - tests/unit/modules/dockerng_test.py
 2017-04-07 11:20:51 -06:00
Mike Place
a7a9b515a6
Add requested docs 2017-04-06 12:53:34 -06:00
Erik Johnson
a6d68f50fe Merge remote-tracking branch 'upstream/2016.3' into merge-2016.3-2016.11 2017-04-06 10:15:47 -05:00
Nicole Thomas
4d7871e4d7 Merge pull request #40494 from rallytime/merge-develop 
[develop] Merge forward from 2016.11 to develop
 2017-04-05 14:15:05 -06:00
rallytime
71f3c73150 Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/template.py
  - salt/utils/pycrypto.py
  - tests/integration/modules/test_state.py
  - tests/unit/states/test_artifactory.py
  - tests/unit/test_template.py
 2017-04-05 13:02:14 -06:00
Erik Johnson
a6064fb2e4 Rename userdata_renderer -> userdata_template in master config docs 2017-04-04 15:41:43 -05:00
Erik Johnson
111188742a Add documentation for userdata_renderer 2017-04-04 15:40:50 -05:00
Mike Place
7a04ed2439 Merge pull request #40497 from DSRCorporation/features/39275_memcache 
Memcache documentation and minor updates.
 2017-04-04 13:55:17 -06:00
Mike Place
fe9bc95b26 Merge pull request #40513 from terminalmage/fileserver-design-docs 
Add initial developer docs on the fileserver and client
 2017-04-04 13:37:35 -06:00
Erik Johnson
906d02f395 Add a section on updating the fileserver 2017-04-04 13:06:45 -05:00
rallytime
8e480fffb5 Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/runners/saltutil.py
 2017-04-04 11:15:41 -06:00
Erik Johnson
4e3a2d066a Add a section on the cp module 2017-04-04 10:00:52 -05:00
Erik Johnson
85b9bb4072 Fix label for RST link 2017-04-04 00:28:12 -05:00
Erik Johnson
6329d3580a Add initial developer docs on the fileserver and client 
This may be expanded, but this gives a brief overview.
 2017-04-03 23:56:08 -05:00
Mike Place
f6803bbd6c Merge pull request #40475 from cloudflare/yang-state 
New state module: NAPALM YANG
 2017-04-03 16:30:54 -06:00
Mike Place
ae43cb69e9 Merge pull request #40458 from cloudflare/napalm-syslog 
New engine: Napalm syslog
 2017-04-03 16:27:10 -06:00
Daniel Wallace
6e2f9080ca update docs for logging handlers 2017-04-03 16:04:53 -05:00
Thomas S Hatch
6279f7c120 fix do to pre correct on python randome function 2017-04-03 14:50:07 -06:00
Thomas S Hatch
66b9515af7 Fix up the doc for failover clarity 2017-04-03 13:24:56 -06:00
Dmitry Kuzmenko
82c45b1a52 Memcache documentation and minor updates. 2017-04-03 19:51:50 +03:00
Mircea Ulinic
66d99b520c Index netyang state 2017-04-01 19:06:35 +00:00
Mircea Ulinic
24cdabd3d4 Netyang autodoc 2017-04-01 18:07:08 +00:00
Mircea Ulinic
b878fe867a napalm_yang module autodoc 2017-04-01 02:48:02 +00:00
Mircea Ulinic
11f090fec9 Add napalm_syslog autodoc 2017-03-31 16:03:16 +00:00
Mike Place
b62c8c2965 Merge pull request #40414 from chaseadamsio/develop 
docs: fix typo in states/index.rst
 2017-03-30 15:00:38 -06:00
Lukas Raska
24cc9b2a0c [WIP] Refactor Elasticsearch execution and state modules (#40192) 
* Add Ingest pipeline methods to Elasticsearch execution module

* Refactor Elasticsearch execution module and properly handle exceptions

* Throw CommandExecutionError in methods applicable for different Elasticsearch versions

* Refactor Elasticsearch states to reflect execution module changes

* Add state for managing Elasticsearch pipelines

* Fix few typos in Elasticsearch module, return None when deleted document doesn't exist

* Implements stats and health methods for Elasticsearch

* Add Elasticsearch methods to open/close index, manage search templates and repositories

* Merge existing Elasticsearch states into single one, add Search Template handling

* Add index alias state for Elasticsearch, fix documentation

* Catch all global exceptions in Elasticsearch states, unit test all of them

* Implement few Unit tests for Elasticsearch execution module, merge fixes into deprecated elastic states

* Implement additional unit tests for Elasticsearch execution module

* Finalize Elasticsearch module documentation
 2017-03-30 13:22:58 -06:00
Chase Adams
f2d855bfbf docs: fix typo in states/index.rst 2017-03-30 04:41:04 -07:00
Chase Adams
b9982e3884 docs: fix typo in states/index.rst 2017-03-30 04:29:31 -07:00
rallytime
52edbffc85 Merge branch '2016.11' into 'develop' 
Conflicts:
  - doc/ref/cache/all/index.rst
  - doc/topics/cache/index.rst
  - salt/cache/localfs.py
  - salt/modules/boto_rds.py
  - salt/roster/cloud.py
  - salt/states/virtualenv_mod.py
  - tests/integration/states/test_archive.py
  - tests/unit/modules/test_dockermod.py
  - tests/unit/states/dockerng_test.py
 2017-03-28 17:09:30 -06:00
Mike Place
d7e745a53a Merge pull request #40281 from terminalmage/rename-docker 
Rename docker execution module to avoid shadowing in the loader
 2017-03-28 11:06:08 -06:00
Erik Johnson
774a3f1147 Rename docker execution module to avoid shadowing in the loader 
With the merging of #39996, salt/modules/docker.py now imports
salt.utils.docker. However, our loader appends the module dir (in
this case salt/modules/) to sys.path temporarily for the length of the
loading process. So, as the docker execution module tries to import
salt.utils.docker, when salt.utils.docker attempts to do an "import
docker", and docker-py is *not* installed, this results in
salt/modules/docker.py (the docker execution module) being loaded in its
place, which results in tracebacks in the minion log.

Renaming the docker execution module keeps this import shadowing from
occurring. Note that we don't need to do this for the placeholder
salt/states/docker.py as it does not import salt.utils.docker.
 2017-03-28 10:50:47 -05:00
Nicole Thomas
d73a526fba Merge pull request #40309 from rallytime/redis-cache-docs 
Move "redis" to "redis_cache" references in docs
 2017-03-24 16:40:07 -06:00
rallytime
5363e0b58b Update minion data cache documentation 
Updats the existing documentation and also adds more documentation
to the Multi-Master and Syndic topology files about the addition
of the pluggable minion data store.
 2017-03-24 14:25:46 -06:00
rallytime
2a483a256a Move "redis" to "redis_cache" references in docs to allow redis_cache docs to build 2017-03-24 12:36:31 -06:00
David Boucha
61f2fa9339 Add documentation for the Minion data cache 
Includes docs for localfs and consul minion data cache modules
 2017-03-24 11:49:26 -06:00
Mircea Ulinic
09670fe9a0 Reference proxy options 2017-03-24 01:55:48 +00:00
Mike Place
e462a04d70 Merge pull request #40200 from DSRCorporation/features/zh864_auth_redesign 
E-Auth refactoring
 2017-03-23 13:32:20 -06:00
rallytime
235a768872 Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/returners/influxdb_return.py
  - salt/states/dockerng.py
  - salt/utils/schedule.py
  - tests/unit/modules/test_docker.py
  - tests/unit/states/dockerng_test.py
  - tests/unit/utils/test_schedule.py
 2017-03-22 17:44:08 -06:00
Dmitry Kuzmenko
b09d83b6d7 Allow to use different auth module for ACL. 2017-03-22 11:49:33 +03:00
Dmitry Kuzmenko
9309a83d21 Optionally keep auth list in token. 2017-03-22 11:49:33 +03:00
Erik Johnson
5ad476936d Overhaul Docker support 
This does the following:

- Splits states for container/volume/image/network management into four
  separate state modules.

- Preserves backward compatibility by making ``docker.image_present``
  invoke ``docker_image.present``, etc.

- Changes how Salt detects that a container needs to be replaced.
  Instead of comparing each passed argument to the named container's
  configuration, it creates a temporary container, and compares that
  container to the named container. If the two differ, then the older
  container is removed, and the new one is renamed and started, becoming
  the named container.

- Removes the unit tests for container management and replaces them with
  integration tests.

- Adds unit tests for the new salt.utils.docker
 2017-03-21 16:53:19 -05:00
C. R. Oldham
bb71710747 Revert "Add special token to insert the minion id into the default_include path" 2017-03-21 13:41:03 -06:00
Mircea Ulinic
01c5c77305 Add proxy_always_alive option from #40178 2017-03-21 14:59:16 +00:00
Mircea Ulinic
186a6c4f2a Add proxy options doc 2017-03-21 14:59:16 +00:00
Mircea Ulinic
97343733ad Proxy config Examples 2017-03-21 14:59:16 +00:00
Mircea Ulinic
1ba599b784 Include proxy config instructions 2017-03-21 14:59:11 +00:00
Mircea Ulinic
c92b42d9af Add logmod doc 2017-03-16 14:00:39 +00:00
Mike Place
51fb191157 Merge pull request #39841 from rafaelcaricio/telegram-beacon 
Telegram beacon
 2017-03-14 13:30:37 -06:00
rallytime
9ddf032e8e Merge branch '2016.11' into 'develop' 
Conflicts:
  - doc/ref/configuration/minion.rst
  - salt/beacons/status.py
  - salt/modules/saltutil.py
  - salt/utils/schedule.py
  - tests/integration/modules/test_beacons.py
  - tests/unit/beacons/inotify_beacon_test.py
 2017-03-10 14:57:31 -07:00
Mike Place
935652cb24 Merge pull request #39923 from cloudflare/capirca-module 
New execution module: Capirca
 2017-03-10 12:25:29 -07:00
Mike Place
dc7d4f4224 Merge pull request #39935 from cro/namespace_proxy_cfg 
Add special token to insert the minion id into the default_include path
 2017-03-10 10:51:54 -07:00
Mike Place
eca9844cca Merge pull request #39926 from cloudflare/netacl-module 
New execution module: netacl (napalm_acl)
 2017-03-09 17:31:34 -07:00
Mike Place
27f1fffd33 Merge pull request #39927 from cloudflare/netacl-state 
Netacl state
 2017-03-09 17:29:26 -07:00
rallytime
c8b5d390b5 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/minion.py
 2017-03-09 16:05:15 -07:00
C. R. Oldham
e4aef54c73 Add special token to insert the minion id into the default_include path 2017-03-09 15:31:16 -07:00
Jonathan Mickle
6b52e5a0b9 updating documentation for librato returner 2017-03-09 10:04:46 -08:00
Mircea Ulinic
fa7a6ff19b Add autodoc for netacl state 2017-03-09 17:09:27 +00:00
Mircea Ulinic
cf535d744e Add autodoc for netacl 2017-03-09 16:54:36 +00:00
Mircea Ulinic
d7dbc05caa Include Capirca autodoc 2017-03-09 16:34:20 +00:00
Rafael Caricio
88589fb1f6 Add documentation for the Telegram bot 2017-03-05 16:09:47 +01:00
Erik Johnson
7178e77eee Improve the Top File matching docs 
In 2014.7.0, default matcher in the top file was changed to the compound
matcher, but the docs still suggest that it is the glob matcher. This
commit updates the docs to explicitly mention that the compound matcher
is now the default, and adds a table describing all of the available
matchers that can be set in the top file.
 2017-03-03 10:40:22 -06:00
rallytime
65b239664e Restore ipv6 connectivity and "master: <ip>:<port>" support 2017-03-01 14:15:07 -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
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
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
Daniel Wallace
88e8a1b1c6 add syncing seperate cache modules on the salt master 2017-02-27 12:15:46 -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
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
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
Ionuț Ciocîrlan
ebe2c3e83b grammar in states/top.rst 2017-02-17 00:26:45 +02: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
Daniel Wallace
d332b33c8a add extmod_blacklist to make it easier to remove modules 2017-02-15 12:47:32 -06:00
Thomas S Hatch
aa6518cac7 Add docs 2017-02-14 13:51:55 -07:00
William Giokas
0647dc8aab doc: Fix the Nix documentation (#39343) 2017-02-13 09:42:37 -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
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
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
rallytime
2f74dcf685 Various doc updates to fix warnings in doc build 2017-02-06 16:56:58 -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
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
Mike Place
56cb200cf8 Merge pull request #39027 from cloudflare/REDIS-CACHE 
Redis cache plugin
 2017-02-02 13:27:26 -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
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
dec7cbf9c5 Add documentation on pillar decryption config items 2017-01-31 11:25:56 -06: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
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
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
rallytime
49f57ba3f1 Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/utils/win_functions.py
 2017-01-25 09:59:29 -07:00
Mircea Ulinic
317fb48ec7 net runner doc 2017-01-25 15:54:45 +00: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
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
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
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
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
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
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
Denys Havrysh
51d4707071 DOCS: add links to File State Backups page where necessary (#38735) 2017-01-14 11:49:21 -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
Mircea Ulinic
515c6643c9
StatusPage module doc 2017-01-05 18:02:13 +00: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
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
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
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
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
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
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
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
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
c83db5a785 Merge pull request #38320 from rallytime/cleanup-doc-refs 
Cleanup doc internal markup references
 2016-12-18 05:31:27 -07:00
rallytime
5940db5b3f Merge branch '2016.3' into '2016.11' 
No conflict.
 2016-12-16 15:25:08 -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
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
rallytime
02bfe7912c Remove more ":doc:" references from doc/* files 2016-12-15 15:36:44 -07:00
rallytime
6e32267d0c Remove ":doc:" references in salt/* files 2016-12-15 14:03:56 -07:00
rallytime
4a62d01577 Add docs for syndic_wait setting 
Fixes #38174
 2016-12-15 10:40:01 -07:00
Andreas Tsaridas
bbadac329c add doc for master config (#38189) 
* add doc for master config

* changes requested
 2016-12-09 17:23:06 -07:00
Mike Place
31180a4733 Merge pull request #38119 from sypets/documentation-requisites-overview-table 
documentation: added overview (table) of requisites to requisites doc
 2016-12-09 11:51:36 -07:00
Sybille Peters
9e53ddd3a9 added info for prereq, changed heading text and formatting 2016-12-08 09:53:57 +01:00
rallytime
4998b8d116 Merge branch '2016.11' into 'develop' 
Conflicts:
  - doc/ref/configuration/master.rst
  - doc/ref/peer.rst
  - doc/topics/reactor/index.rst
 2016-12-07 16:31:11 -07:00
Megan Wilhite
1a42e24e72 Fix beacon index (#38129) 
* add new beacon modules to index

* add salt.beacons.avahi_announce to index and release notes
 2016-12-07 10:44:53 -07:00
Sybille Peters
94bd10ec12 changes for more clarity 2016-12-07 16:41:42 +01:00
Sybille Peters
1964fcf638 documentation: added overview (table) of requisites to requisites doc 2016-12-07 10:57:02 +01:00
rallytime
9b2bbe77ef Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/modules/archive.py
  - salt/netapi/rest_tornado/saltnado.py
 2016-12-06 10:03:10 -07:00
rallytime
8fd53a4808 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - doc/topics/cloud/vsphere.rst
  - salt/config/__init__.py
  - salt/daemons/masterapi.py
  - salt/templates/rh_ip/network.jinja
  - salt/utils/parsers.py
  - tests/unit/daemons_test.py
 2016-12-02 12:18:18 -07:00
Ch3LL
e95f88fbe3 add docs for hash_type change to sha256 2016-12-02 09:28:50 -07:00
Mircea Ulinic
3375e5fe30
netconfig state doc 2016-12-02 13:27:44 +00:00
Mike Place
03e0fd39d1 Merge pull request #37963 from terminalmage/tgt_type 
Deprecate expr_form argument in the LocalClient
 2016-12-02 02:45:16 -07:00
rallytime
0eab0ee8a6 Merge branch '2016.11' into 'develop' 
Conflicts:
  - doc/topics/releases/2016.11.0.rst
 2016-12-01 12:14:33 -07:00
Nicole Thomas
6942d5d95b Merge pull request #37995 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-11-30 13:12:55 -07:00
Mike Place
69a74a4d2d Merge pull request #37950 from vutny/fix-starting-up-syndic 
Set default Salt Master address for a Syndic (like for a Minion)
 2016-11-30 11:09:03 -07:00
rallytime
b44e17921c Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-11-30 09:21:45 -07:00
Denys Havrysh
7d9bc9abce syndic_master: correct default value, documentation and example config 2016-11-30 17:18:44 +02:00
Erik Johnson
61ed9a8657 Add clarifying language to ext_pillar_first docs 
Also remove a sentence which may lead people to believe that they can
make git_pillar and pillar_roots share top/sls files and be compiled
together.
 2016-11-29 15:49:05 -06:00
Erik Johnson
6135dfa4dd Revert addition of pillar_roots_override_ext_pillar 
This turned out to be an unnecessary addition, as the root cause was
ext_pillar_first not behaving as documented.
 2016-11-29 15:35:04 -06:00
Nicole Thomas
2723188c6f Merge pull request #37956 from rallytime/merge-develop 
[develop] Merge forward from 2016.11 to develop
 2016-11-29 13:52:38 -07:00
Erik Johnson
7f269bc7f9 Add clarification on expr_form usage and future deprecation (#37964) 2016-11-29 13:45:11 -07:00
Erik Johnson
f7acb34248 Deprecate expr_form argument in the LocalClient 
The published commands and the events all use tgt_type, expr_form is
only used in the LocalClient, which has been confusing to many users.
This puts expr_form on a deprecation path, allowing it to continue to be
supported while tgt_type becomes the new official argument name.
 2016-11-29 14:03:34 -06:00
Mike Place
856407ee27 Merge pull request #37951 from gtmanfred/develop 
retry states didn't make it into carbon
 2016-11-29 09:51:21 -07:00
rallytime
4760455600 Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/grains/core.py
  - salt/modules/dockerng.py
  - tests/unit/modules/linux_acl_test.py
 2016-11-29 09:31:05 -07:00