valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
75,868 Commits 24 Branches 182 Tags 341 MiB
6750ccd78e
Commit Graph

1977 Commits

Author SHA1 Message Date
Justin Findlay
478def4923 doc.ref.configuration.minion: add proxy vars 2016-10-18 10:50:37 -06:00
Daniel Wallace
2a4c9ac4f3 document master_type disable (#37014) 2016-10-14 12:24:12 -06:00
rallytime
1d3aaf8097 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - doc/ref/configuration/minion.rst
 2016-10-12 15:26:27 -06:00
rallytime
5362e5183e Merge branch '2015.8' into '2016.3' 
Conflicts:
  - doc/ref/cli/index.rst
 2016-10-12 12:36:00 -06:00
Mate Ory
d2f8f18430 doc: document what the argument of salt --subset means 2016-10-12 10:42:31 -06:00
Jacob Hammons
dd21da4992 Add autodoc topics for new modules added in Carbon (#36933) 
Module formatting issues
Add list of new Carbon modules to release notes
 2016-10-12 09:31:07 -06:00
Nicole Thomas
7838d8d3f9 Remove "Targeting with Executions" section from docs (#36925) 
This feature was removed long ago and is no longer under development.

Fixes #36906
 2016-10-11 16:33:56 -06:00
Erik Johnson
a56bf8bd2d Update references to future default value change that was reverted (#36924) 2016-10-11 16:33:41 -06:00
Erik Johnson
e5425f3e8c Revert change in default value for top_file_merging_strategy (#36922) 
This causes problems when a Carbon master tries to run states on a
non-Carbon minion.
 2016-10-11 16:33:23 -06:00
rallytime
9ae34b2329 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - doc/topics/beacons/index.rst
 2016-10-10 10:19:50 -06:00
Jorge Schrauwen
0b304e75a3 missing docs for salt.modules.apcups (#36863) 2016-10-08 19:51:45 -06:00
rallytime
f73bdf55c2 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - salt/cloud/clouds/vultrpy.py
  - salt/modules/ini_manage.py
  - salt/states/glance.py
 2016-10-07 09:51:21 -06:00
Justin Findlay
cc071b75cb doc.glossary: add idempotent 2016-10-06 16:17:22 -06:00
Mike Place
4bdb997dae Merge pull request #36785 from cachedout/pr-36728 
Fixup merge forward #36728
 2016-10-05 20:02:16 +09:00
rallytime
24b8bba145 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-09-30 16:13:08 -06:00
Yoram Hekma
3bb2cb6379 Update doc to reflect the version where 'none' was added as a pillar_source_merging_strategy 2016-09-30 15:59:21 -06:00
rallytime
555ae9aa9b Merge branch '2016.3' into 'carbon' 
No conflicts.
 2016-09-30 10:13:39 -06:00
Erik Johnson
3d15eedfe0 Add additional information about onchanges/onchanges_in 2016-09-29 23:02:39 -05:00
Justin Findlay
4dd4fc94dc log levels doc: try long form table 
sphinx didn't render the shorthand table
 2016-09-29 10:11:06 -06:00
rallytime
112903ad7e Merge branch '2016.3' into 'carbon' 
Conflicts:
  - conf/master
  - doc/ref/configuration/master.rst
  - salt/cli/daemons.py
  - salt/client/ssh/__init__.py
  - salt/config/__init__.py
  - salt/modules/archive.py
  - salt/modules/cmdmod.py
  - tests/unit/states/service_test.py
 2016-09-29 09:56:43 -06:00
rallytime
da574e5b03 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/client/ssh/__init__.py
  - salt/config/__init__.py
  - salt/runners/thin.py
 2016-09-28 09:01:24 -06:00
Bo Maryniuk
a441b35588 Add documentation about Salt Thin configuration 2016-09-27 11:12:07 +02:00
David Boucha
9d3ad82ae5 Merge pull request #36222 from damon-atkins/update_to_35899_win_pkg 
Update to PR 35899 win_pkg
 2016-09-26 21:01:30 -06:00
Erik Johnson
58dd0d5cdc Cleanup for #36222 (#1) 
Updates to  salt/states/pkg.py, modules/win_pkg.py, doc/ref/configuration/minion.rst
 2016-09-27 11:36:42 +10:00
rallytime
d5bbd91c14 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - conf/master
 2016-09-23 17:01:17 -06:00
Nicole Thomas
5548ed771d Back-port #36435 to 2016.3 (#36532) 
* Added "none" option for pillar_source_merging_strategy

* added none to merging strategy in dictupdate so we no longer log warnings when it is selected

* Updated documentation

* fix for when pillar_source_merging_strategy is not set

* Fix looking up pillar data when merging is set to "none" and no saltenv was passed

* Fix looking up pillar data when merging is set to "none" and no saltenv was passed retry

* Let's not break when no merging strategy is passed

* Capitalisation

* Update on doc
 2016-09-23 13:36:23 -06:00
rallytime
d0ec4ead2a Merge branch '2016.3' into 'carbon' 
No conflicts.
 2016-09-23 08:32:17 -06:00
Erik Johnson
cc9d41fb0e Change items in minionfs blacklist/whitelist example 
These were copypasta'ed from gitfs' blacklist/whitelist example, but
they aren't as apropos here because the blacklist/whitelist for minionfs
is meant to refer to minion IDs, not branches/tags like in gitfs.
 2016-09-22 18:22:03 -05:00
Erik Johnson
37c48472d6 Add documentation for fileserver_list_cache_time 2016-09-12 16:29:09 -05:00
Mike Place
2e76f73ea1 Merge pull request #35918 from rallytime/fix-18614 
Remove the compact outputter
 2016-09-02 00:49:43 +09:00
C. R. Oldham
908234d9ab Document module whitelisting. Remove FIXME comments for disable_modules and disable_returners as they are definitely implemented. (#35717) 2016-09-01 09:40:36 -06:00
rallytime
eed0a9d23d Remove the compact outputter 
This outputter was originally introduced in the 2014.7 branch, but
quickly regressed and never worked in a released version of Salt. Since
then, its existence has caused much confusion. In addition, this
outputter actually was supposed to accomplish the same thing as setting
"state_verbose" to False. Therefore, it doesn't make sense to maintain
two outputters (this one and the highstate outputter).

Fixes #18614
 2016-08-30 14:16:59 -06:00
rallytime
bd157b8dbe Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/utils/cloud.py
 2016-08-30 12:03:06 -06:00
Mike Place
f7d8f408c2 Merge pull request #35822 from terminalmage/issue35045 
Fixes for top file merging
 2016-08-31 01:40:41 +09:00
rallytime
9e55bee5d5 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-08-30 10:17:53 -06:00
Loren Gordon
08e10f69eb Clarifies how to create aliased functions (#35891) 2016-08-30 10:04:58 -06:00
Erik Johnson
f2f4482fa0 Update top file merging docs to reflect new strategy 2016-08-30 08:58:18 -05:00
rallytime
4ebfde9337 Remove node refernce in execution module docs: doesn't exist. 2016-08-29 15:33:26 -06:00
rallytime
2320865e5c Remove references to logstash_http engine: should be http_logstash. 2016-08-29 14:59:06 -06:00
rallytime
82e9cb748f Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/client/mixins.py
  - salt/engines/sqs_events.py
  - salt/minion.py
 2016-08-29 12:48:43 -06:00
Nicole Thomas
96792663da Add engines to list of extension module options in master config docs (#35864) 
Fixes #35837
 2016-08-29 12:22:30 -06:00
rallytime
5f93d682aa Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/client/ssh/__init__.py
 2016-08-29 10:56:11 -06:00
Erik Johnson
c534d88280 More clarification/correction in minion docs 2016-08-27 15:18:06 -05:00
Erik Johnson
e9e6ea8485 One more tweak to top file merging docs 
This catches one more inaccuracy that wasn't fixed in
https://github.com/saltstack/salt/pull/35774
 2016-08-27 14:30:14 -05:00
rallytime
2b1ad9e9b9 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/utils/gitfs.py
 2016-08-26 14:54:54 -06:00
rallytime
e8e73b55ac Merge branch '2015.8' into '2016.3' 
Conflicts:
  - doc/topics/jobs/schedule.rst
  - salt/states/user.py
 2016-08-26 13:21:12 -06:00
Nicole Thomas
0ee237a9cb Remove extra "to" in top.rst docs (#35808) 
Refs #35774
 2016-08-26 10:38:57 -06:00
Alexander Bauer
e4dfc21581 Trivial documentation spelling fix (#35800) 
Change `statnds` to `stands` in State Writing documentation.
 2016-08-26 10:30:08 -06:00
Erik Johnson
2fc61763d8 Correct the top_file_merging_strategy documentation (#35774) 
Top file merging does not work as described in the docs, this is being
corrected for the Carbon release. This commit fixes the docs so that
they A) are accurate for these older release branches, and B) refer to
the Carbon release as a point when top file merging was corrected.

These references to the Carbon release will need to be updated again
once we settle on a version number for Carbon.
 2016-08-26 10:25:56 -06:00
rallytime
6464236f68 Merge branch '2016.3' into 'develop' 
Conflicts:
  - doc/conf.py
  - doc/ref/returners/index.rst
  - salt/states/disk.py
 2016-08-25 16:09:01 -06:00
Nicole Thomas
6784cb036d Implement suggestions of bytes vs str type for #35593 (#35783) 
* Implement suggestions of bytes vs str type for #35593

Refs #35593

* Str, not bytes
 2016-08-25 15:45:51 -06:00
Mike Place
89bf5cf250 Developer documentation for Unicode handling (#35593) 
* Developer documentation for Unicode handling

* Clarifications
 2016-08-25 15:30:31 -06:00
Nicole Thomas
cd90052187 Documentation spelling fixes (#35773) 
Fixes #35771
 2016-08-25 13:41:03 -06:00
rallytime
b80ef26cf2 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/cli/batch.py
  - salt/minion.py
  - salt/modules/cassandra_cql.py
  - salt/modules/rsync.py
 2016-08-23 10:44:55 -06:00
rallytime
1d819d7cc2 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-08-22 09:29:13 -06:00
Brian Glogower
2801f0fdcc Remove duplicate auth_tries in minion docs 2016-08-19 17:46:26 -07:00
Nicole Thomas
f7f8221169 Everything in the sample master config file should be commented out (#35611) 2016-08-19 16:05:40 -06:00
Mike Place
69b44bc6f8 Merge pull request #35500 from rallytime/fix-35068 
Add docs for pillar_raise_on_missing option
 2016-08-17 18:15:29 +09:00
rallytime
cface344d6 Add docs for pillar_raise_on_missing option 
Fixes #35068
 2016-08-16 14:57:58 -06:00
Mike Place
e3858d8f80 Merge pull request #35400 from thatch45/snapper_states 
Introduce rollback to Salt States
 2016-08-16 12:04:39 +09:00
Mike Place
c7564d997a Merge pull request #35464 from rallytime/merge-develop 
[develop] Merge forward from 2016.3 to develop
 2016-08-16 10:26:54 +09:00
Thomas S Hatch
4cc2add938 Add soem more notes to the salt-cp doc 2016-08-15 15:59:41 -06:00
rallytime
48cc3bdfaa Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/modules/dockerng.py
  - tests/unit/modules/dockerng_test.py
 2016-08-15 13:27:52 -06:00
rallytime
6a86a12294 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/modules/cp.py
 2016-08-15 11:23:44 -06:00
Mike Place
09925ba353 Minor doc fixup (#35436) 
* Minor doc fixup

Refs #35387

* Include reload_grains
 2016-08-15 09:53:56 -06:00
rallytime
1fe0b69a6c Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/modules/blockdev.py
  - salt/modules/ddns.py
  - salt/modules/inspectlib/collector.py
  - salt/modules/linux_sysctl.py
  - salt/modules/status.py
  - salt/modules/x509.py
  - salt/utils/process.py
  - salt/utils/verify.py
  - tests/integration/__init__.py
  - tests/integration/modules/state.py
  - tests/integration/states/cmd.py
 2016-08-12 16:21:58 -06:00
Thomas S Hatch
63a4a36454 Add config docs 2016-08-11 15:52:44 -06:00
Justin Findlay
66332510c6 doc.ref.configuration.logging: document log levels 2016-08-10 14:10:43 -06:00
Justin Findlay
93616eff3e doc.ref.configuration.logging: fix formatting 2016-08-10 10:47:07 -06:00
Justin Findlay
472a2d31de doc.ref.configuration.logging: cleanup formatting 2016-08-10 10:46:39 -06:00
rallytime
de4b33f2e1 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/client/ssh/__init__.py
  - salt/client/ssh/shell.py
  - salt/config/__init__.py
  - salt/grains/core.py
  - salt/utils/gitfs.py
 2016-08-08 12:34:23 -06:00
rallytime
9216e8ad93 Remove deprecated vsphere cloud driver in Carbon release 
This driver has been marked for deprecation and removal in Carbon.
Release notes were updated accordingly.

Users will need to use the vmware cloud driver instead.
 2016-08-05 16:16:12 -06:00
Nathan Gould
3683f9a715 Improve clarity of requisite docs 
Docs should stick to the terms "required" vs. "dependent", where required means the state that has to happen first, and dependent means the state that relies on the required state.
 2016-08-04 15:14:39 -04:00
C. R. Oldham
84cc7d67c0 Add documentation for append_minionid_config_dirs. 2016-08-03 12:36:37 -06:00
Mircea Ulinic
2d2407f036
http_logstash engine 2016-08-02 12:11:04 +00:00
Erik Johnson
d54d14c6cf Add documentation for runner_returns config option 2016-08-01 23:04:05 -05:00
Mike Place
4fe3397a41 Merge pull request #34921 from tonybaloney/quickstart 
Introduce a template system for extending SaltStack open
 2016-07-28 22:38:10 -06:00
Mike Place
404833e51b Merge pull request #34969 from fdamstra/Add_multi_event_return 
Adds support for multiple server-side event_returners.
 2016-07-28 13:39:52 -06:00
Anthony Shaw
5b2a97e22b
added docs 2016-07-28 11:33:42 +10:00
Erik Johnson
a5c78d626e Improve accuracy and formatting of execution module docs 2016-07-27 11:57:12 -05:00
Fred Damstra
8b56d76490 Adds support for multiple server-side event_returners. 
The master config 'event_return' can now take a list
of returners which will each be called in turn. It
continues to function with the previous configuration
format of a single item.
 2016-07-27 11:41:59 -04:00
rallytime
d679c09e65 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/config/__init__.py
  - salt/utils/parsers.py
  - tests/unit/config/config_test.py
 2016-07-18 10:34:03 -06:00
rallytime
7d106c78f0 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-07-18 09:45:00 -06:00
rallytime
9c803d05a5 Add output_file option to master config docs 
Fixes #34703
 2016-07-16 12:45:55 -06:00
Denys Havrysh
a8b79e8dc1 event_return_* master opts: update doc and config examples 
Signed-off-by: Denys Havrysh <Denys.Gavrysh@gmail.com>
 2016-07-15 15:27:48 +03:00
Fred Damstra
d75276f9d9 Added documentation link for rawfile_json returner. 2016-07-13 20:34:27 -04:00
rallytime
49f40e9d99 Merge branch '2016.3' into 'develop' 
Conflicts:
  - doc/conf.py
  - doc/topics/reactor/index.rst
  - tests/integration/__init__.py
 2016-07-12 16:13:56 -06:00
rallytime
f734afd0b0 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/modules/aptpkg.py
  - tests/integration/__init__.py
 2016-07-12 14:29:35 -06:00
Erik Johnson
ae38c874da Add a bunch of documentation on getting files from other environments (#34560) 
* Remove :members: from fileserver docs pages

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

* Rename section

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

* Add reminder that file_roots can be specified for masterless salt

* Link to the new environments page from the states tutorial

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

* Add examples of querystring syntax to cp module
 2016-07-08 17:15:27 -04:00
rallytime
86b7c71e09 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/modules/glusterfs.py
  - salt/states/pkg.py
 2016-07-07 13:37:58 -06:00
rallytime
27988dde48 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - doc/ref/configuration/minion.rst
 2016-07-07 12:31:12 -06:00
Erik Johnson
8722257b82 Improve top file merging documentation (#34505) 
* Add top file config params to minion config file documentation

* Improve documentation on top file merging behavior

* Add recommendation on changing top_file_merging_strategy

* Improve the log message warning of multiple top files
 2016-07-07 12:04:27 -04:00
rallytime
d850167efd Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/minion.py
 2016-06-30 16:11:04 -06:00
Nicole Thomas
70e1f18b89 Beacon network docs (#34386) 
* Add beacons/network_settings to doc build

* Add a versionadded tag for the beacons.network_settings module
 2016-06-30 11:12:55 -04:00
rallytime
cc83fa151a Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/modules/status.py
  - salt/utils/__init__.py
  - tests/unit/modules/boto_vpc_test.py
  - tests/unit/modules/mount_test.py
  - tests/unit/states/boto_vpc_test.py
 2016-06-28 17:34:27 -06:00
rallytime
f9ab8ba46d Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-06-28 14:26:24 -06:00
jacobhammons
0c60feac02 Doc clarifications to file modules, addition of new profile log level to docs, fixed example in dnsmasq (#34323) 
Refs #34249
Refs #34261
Refs #33694
Refs #34247
 2016-06-28 12:03:59 -04:00
Nicole Thomas
76c8bb0d1c Use correct feature branch name (#34317) 2016-06-27 18:26:19 -04:00
rallytime
8479c45728 Merge branch '2016.3' into 'develop' 
No conflicts.
 2016-06-21 17:29:44 -06:00
rallytime
f577681f0b Update docs to match log_level warning default 
Fixes #34162
 2016-06-21 09:31:59 -06:00