Commit Graph

2169 Commits

Author SHA1 Message Date
Super-User
cf2898fbdb generate docs for salt.states.logadm 2017-04-09 15:44:18 +02: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
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