valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
58,101 Commits 24 Branches 182 Tags 341 MiB
03400ef45b
Commit Graph

1466 Commits

Author SHA1 Message Date
Justin Findlay
0fd180e106 add test logic to state reult doc 2015-08-05 09:36:08 -06:00
Colton Myers
f4cb659a2a Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/topics/windows/windows-package-manager.rst
    salt/modules/event.py
    salt/returners/carbon_return.py
    salt/state.py
    salt/states/pkg.py
 2015-08-03 14:50:50 -06:00
Justin Findlay
7e121de907 Update minion.rst 2015-07-31 17:34:07 -06:00
Jacob Hammons
ac0a8ff711 Doc on using syndic with multimaster 2015-07-31 15:25:15 -06:00
Colton Myers
e29be766bb Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    debian/changelog
    doc/man/salt.7
    salt/cloud/__init__.py
    salt/cloud/clouds/proxmox.py
    salt/cloud/clouds/vmware.py
    salt/config.py
    salt/fileclient.py
    salt/minion.py
    salt/modules/chocolatey.py
    salt/modules/localemod.py
    salt/modules/pacman.py
    salt/modules/pkgng.py
    salt/modules/schedule.py
    salt/modules/state.py
    salt/modules/win_file.py
    salt/modules/win_pkg.py
    salt/state.py
    salt/states/file.py
    salt/utils/args.py
    tests/unit/states/file_test.py
 2015-07-30 16:54:44 -06:00
Jacob Hammons
3f3db4bd8e Additions for #24042 2015-07-30 15:43:21 -06:00
Jacob Hammons
db2129b199 Minor doc bug fixes 
Refs #24042
Refs #25650
Refs #21296
Refs #23788
 2015-07-30 14:39:15 -06:00
Justin Findlay
d73964ea3c add console_log_fmt color documentation 2015-07-28 16:16:29 -06:00
Thomas S Hatch
29c66d85a4 Merge pull request #25740 from rallytime/bp-25722 
Back-port #25722 to 2015.5
 2015-07-27 10:08:40 -06:00
Alexey Pakseykin
c33eb813ea Change docs for --static option with JSON - text B 2015-07-27 09:00:59 -06:00
Alexey Pakseykin
89dd2ec8fb Change docs for --static option with JSON - text A 2015-07-27 09:00:59 -06:00
Mike Place
0dc28ad3e4 Return to str for master_type for 2015.5 2015-07-24 11:55:56 -06:00
David\ Beitey
f65397036f Fix doc around Include/Exclude for states 2015-07-24 09:42:25 +10:00
Mike Place
bc2321a5c6 Merge pull request #25595 from terminalmage/git_pillar-rewrite 
Bring git_pillar up to feature parity with gitfs
 2015-07-22 10:55:13 -06:00
Mike Place
3fe4a75a7f Merge pull request #25578 from davidjb/relative-includes 
Allow parent relative includes in state files
 2015-07-22 10:51:12 -06:00
Erik Johnson
a2fc11ef57 Add new git_pillar configuration docs 2015-07-21 16:46:14 -05:00
David\ Beitey
9ad0ddc549 Allow parent relative includes in state files 
This implements the solution to #25477.  Any ``include`` directives
within state files can use multiple dot notation (influenced by Python
relative imports) to refer to a parent state.

This also implements the same functionality inside the stateconf
renderer
(http://docs.saltstack.com/en/latest/ref/renderers/all/salt.renderers.stateconf.html),
which supported relative includes, excludes, and prefixed states.  This
PR expands on existing tests for stateconf.

This also updates the documentation accordingly.
 2015-07-21 16:32:38 +10:00
Colton Myers
76e468bc20 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/topics/cloud/vmware.rst
    salt/cloud/clouds/digital_ocean_v2.py
    salt/cloud/clouds/vmware.py
    salt/daemons/flo/core.py
    salt/modules/hipchat.py
    salt/modules/lxc.py
    salt/modules/rabbitmq.py
    salt/pillar/s3.py
    salt/states/dockerio.py
    salt/states/file.py
    salt/utils/process.py
    salt/utils/s3.py
 2015-07-20 13:55:14 -06:00
Joseph Hall
725d1a40d0 Merge pull request #25519 from rallytime/backport_vmware 
Backport vmware driver to 2015.5 branch
 2015-07-20 09:11:26 -06:00
David\ Beitey
bfc4f9fd85 Fix typo in extend declaration doco 2015-07-18 14:39:29 +10:00
rallytime
0f4f560b38 Backport vmware driver to 2015.5 branch 2015-07-17 10:53:42 -06:00
Jeff Quast
e947d8ec5a docfix: "cache_jobs: False" => grains_cache: False" 
At the currently rendered anchor link: http://docs.saltstack.com/en/latest/ref/configuration/minion.html#grains-cache

We see the use of "cache_jobs" in the yaml example for the section describing "grains_cache"
 2015-07-16 09:24:07 -06:00
Colton Myers
2a144b954a Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/ref/states/requisites.rst
    doc/topics/tutorials/states_pt5.rst
    salt/cloud/clouds/ec2.py
    salt/config.py
    salt/minion.py
    salt/modules/cp.py
    salt/pillar/__init__.py
    salt/states/file.py
 2015-07-14 10:57:36 -06:00
Arnold Bechtoldt
3e2edd33d4 refactor elasticsearch integration 
* salt.modules.elasticsearch
* salt.states.elasticsearch*
* salt.returners.elasticsearch
 2015-07-14 09:00:26 -06:00
Jarpy
da9c0eb673 Typo in client_acl ref doc. 2015-07-14 08:54:32 -06:00
Jarpy
50e0baf270 Demonstrate per-minion client_acl. 
The client_acl system supports setting restrictions based on minion name.
Update the Client ACL System reference page to reflect this.
 2015-07-14 08:54:32 -06:00
Arnold Bechtoldt
8eb2ac1dbe set correct indention in states/requisites.rst (docs), fixes #25281 2015-07-11 18:25:20 +02:00
rallytime
1b7efa91e0 Remove references to Beryllium in relevant docs 2015-07-08 11:17:01 -06:00
rallytime
c0c2463b64 Partial backport of #25019 
Only backport the new .rst files for states that exist in the 2015.5 branch

Refs #25019
 2015-07-06 09:28:43 -06:00
Colton Myers
24d51fb8f1 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/ref/configuration/minion.rst
    salt/config.py
    salt/modules/sudo.py
    tests/integration/states/file.py
 2015-07-02 09:46:36 -06:00
Joseph Hall
1e4f7aa574 Add man page for spm, change pillar to .orig 2015-06-30 09:45:13 -06:00
Justin Findlay
44cb167744 adding sudo_user minion config docs 2015-06-30 03:10:56 -06:00
Arnold Bechtoldt
689ba5686b add missing module documentation to references 2015-06-27 19:12:50 +02:00
Colton Myers
f65e663353 Merge pull request #24937 from basepi/merge-forward-develop 
Merge forward from 2015.5 to develop
 2015-06-25 16:03:47 -06:00
Mike Place
fbea069319 Remove duplicate func doc 
Closes #23613
 2015-06-25 15:48:44 -06:00
Colton Myers
acb7c6f52b Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    salt/minion.py
    salt/modules/network.py
    salt/utils/cloud.py
    salt/utils/job.py
 2015-06-24 11:44:04 -06:00
C. R. Oldham
90c73ff446 References to documentation. 2015-06-23 11:40:06 -06:00
Colton Myers
a5c9681672 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    doc/topics/releases/version_numbers.rst
    salt/cli/batch.py
    salt/minion.py
    salt/state.py
    setup.py
 2015-06-18 11:43:11 -06:00
Michael Steed
f92a769d35 Remove doc references to obsolete minion opt 2015-06-17 15:29:50 -06:00
mattmb
a5607d5e07 Multiple onchanges requisite behaviour 
Change the onchanges requisite so that if you list multiple onchanges
requisites then only one must change to trigger the state. Currently all
the watched states must change to cause the trigger. This fixes #19592
 2015-06-16 15:02:11 +01:00
Jacob Hammons
c7cdd416a2 Doc bug fixes 
Refs #24547
Refs #24275
Refs #24375
Refs #24560
Refs #24163
 2015-06-12 11:23:52 -06:00
Jacob Hammons
f3f34ddff6 2015.5.2 release changes 
Refs #24250
Refs #24457
 2015-06-11 10:01:30 -06:00
Thomas S Hatch
20ada1f8a1 Merge pull request #24551 from joejulian/2015.5_dont_pollute_environment 
2015.5 dont pollute environment
 2015-06-10 20:13:06 -06:00
Colton Myers
d9db80cafd Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 2015-06-10 12:01:43 -06:00
Jacob Hammons
8df5d53bb8 Refs #24235 2015-06-10 09:45:03 -06:00
Joe Julian
9cb7015568 Mark keyword version adds 2015-06-09 12:50:24 -07:00
Joe Julian
76e2583265 Merge tls changes from develop 2015-06-09 12:48:36 -07:00
Colton Myers
94d6ef1d17 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    doc/ref/modules/all/salt.modules.ipmi.rst
    doc/ref/states/all/salt.states.tls.rst
    doc/topics/cloud/index.rst
    doc/topics/cloud/vsphere.rst
    doc/topics/eauth/index.rst
    salt/cli/batch.py
    salt/modules/cmdmod.py
    salt/modules/ipmi.py
    salt/netapi/rest_cherrypy/app.py
    salt/runners/http.py
    salt/states/boto_elb.py
    salt/states/dockerio.py
    salt/states/linux_acl.py
    salt/states/win_servermanager.py
    salt/wheel/config.py
 2015-06-09 11:41:07 -06:00
Thomas S Hatch
0d9e0c2b8c Merge pull request #24468 from jacobhammons/doc-fixes 
Bug fixes and build errors
 2015-06-08 09:25:40 -06:00
Alexander Schwartz
7d6b60c79d change "path" to "name" for "file" operations 
Path is no supported parameter for any file operation (maybe it has been in the past)
 2015-06-07 13:14:26 +02:00
Jacob Hammons
d45c4ed11f Bug fixes and build errors 
Refs #23211
Refs #24268
Refs #24235
Refs #24193
Refs #24172
Refs #19901
Refs #19801
 2015-06-05 17:32:35 -06:00
Colton Myers
6d503c12ea Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    doc/ref/modules/all/salt.modules.ipmi.rst
    doc/ref/modules/all/salt.modules.system_profiler.rst
    salt/fileclient.py
    salt/loader.py
    salt/modules/tls.py
    salt/modules/win_path.py
    salt/states/pkg.py
    salt/utils/event.py
    salt/utils/pagerduty.py
    tests/unit/modules/seed_test.py
 2015-06-05 13:03:48 -06:00
Jacob Hammons
1f7a13d6f9 Salt cloud doc updates, build errors and bug fixes 
Refs #24309
 2015-06-04 16:42:47 -06:00
Arnold Bechtoldt
fc7f0724d3 add missing module documentation to references 2015-06-04 21:17:24 +02:00
Ryan Lane
a3924bba0e Add boto_kms docs 2015-06-03 15:18:52 -07:00
Thomas Jackson
2c6a5c7d1e Add comment attempting to explain the security shortcomings of salt-cp 
salt-cp definitely has its uses, but I want to call out the fact that it isn't designed as a secure file transfer mechanism.
 2015-06-02 18:26:04 -07:00
Aneesh Agrawal
82a4794e0f Do not reference serializers from aggregation docs. 2015-05-28 20:04:20 -04:00
Aneesh Agrawal
4b9311507c Add new module type for serializers from issue #22257. 
Move existing serializers from salt.utils.serializers to
salt.serializers.
 2015-05-28 20:03:11 -04:00
rallytime
d8daa9dcd7 Merge #24185 with a couple of fixes 
Refs #24185
 2015-05-27 15:25:27 -06:00
Jacob Hammons
0689815d0e Fixes for doc build errors 2015-05-27 11:40:31 -06:00
Drew Malone
fb0f1080dd Quick note on usability of 'include' statement. 2015-05-20 10:46:03 -04:00
Nitin Madhok
9dc1e0b3ae Fixing sphinx errors and warnings 2015-05-18 12:12:07 -04:00
Nitin Madhok
12ea8f5c52 Fixing more sphinx/docs errors and warnings 2015-05-16 19:24:04 -04:00
Thomas S Hatch
d951bc8ad4 Merge pull request #22548 from terminalmage/docker-ng 
Add docker-ng state module
 2015-05-15 12:09:58 -06:00
rallytime
580ed73840 Add a couple of grammar fixes to opts docs 2015-05-13 09:04:26 -06:00
Mike Place
1432077bd8 Add documentation about opts generation 2015-05-12 23:41:02 -06:00
Daniel Hobley
899ba78e79 Added power cfg module and state for windows minions 
- Allows you to set power settings on a windows minion for things like the monitor and disk
 2015-05-12 14:49:48 +02:00
Jacob Hammons
16d8a753ad saltstack2 sphinx theme and build settings 2015-05-11 17:29:12 -06:00
Forrest
552eb52c7b Add details to first line. 
We don't specify the top.sls in the first sentence which can be mildly confusing.
 2015-05-11 12:24:15 -07:00
Colton Myers
1bf2ff994e Merge pull request #23430 from basepi/merge-forward-develop 
Merge forward from 2015.5 to develop
 2015-05-08 16:46:21 -06:00
Thomas S Hatch
bfcee39e99 Merge pull request #23399 from mattrobenolt/expose-grains 
Add salt.loader.grain_funcs
 2015-05-08 08:37:30 -06:00
Colton Myers
ece63c36a3 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    doc/topics/ssh/roster.rst
    salt/modules/win_groupadd.py
 2015-05-06 15:49:50 -06:00
Colton Myers
ccf6690be8 Merge pull request #23398 from basepi/merge-forward-develop 
Merge forward from 2015.2 to develop
 2015-05-06 15:42:44 -06:00
Colton Myers
1fb84450f4 Merge pull request #23396 from basepi/merge-forward-2015.2 
[2015.2] Merge forward from 2014.7 to 2015.2
 2015-05-06 15:42:35 -06:00
Erik Johnson
4fea5ba477 Add missing RST file 2015-05-06 12:06:49 -05:00
Erik Johnson
d395565bf7 Update Lithium docstrings in 2015.2 branch 2015-05-06 09:27:40 -05:00
Matt Robenolt
2e55f55c5d Add salt.loader.grain_funcs 
Exposes all of the functions that make up all of the grains. This
allows a user to call individual grain functions without collecting
all of them.
 2015-05-05 20:12:06 -07:00
David Boucha
10e0a2a0a2 clean up doc a bit 2015-05-05 17:14:57 -06:00
David Boucha
750bae117d add docs for the fire_event state feature 2015-05-05 17:14:57 -06:00
Colton Myers
2981aed48e Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 2015-05-05 16:49:31 -06:00
Colton Myers
fd09cdae6f Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
    doc/topics/ssh/roster.rst
    salt/client/ssh/__init__.py
    salt/client/ssh/wrapper/__init__.py
    salt/config.py
    salt/modules/file.py
    salt/runners/lxc.py
 2015-05-05 16:26:39 -06:00
Ryan Lane
f03c68655c Add missing pagerduty and boto docs 2015-05-04 23:31:26 -07:00
Colton Myers
cb69cd07de Match the master config template in the master config reference 2015-05-04 15:05:21 -06:00
Colton Myers
91dd9dcbdc Add ssh_minion_opts to master config ref 2015-05-04 15:00:28 -06:00
Steve Weber
97513b060a include module_dirs 
include module_dirs
 2015-05-04 13:00:31 -04:00
Thomas S Hatch
1a93deaf17 Merge pull request #23275 from terminalmage/issue5504 
Add pkg.group_installed state
 2015-05-02 18:41:39 -06:00
Seth House
d844ca5112 Removed docs for ext_pillar module that is a wip 2015-05-01 14:24:01 -06:00
Seth House
6be273d5f3 Removed stormpath_mod and linodepy docs; these were renamed 2015-05-01 14:24:00 -06:00
Seth House
cda915bcd4 Remove fsutils module documentation 
This module was moved to the utils folder in #17883.
 2015-05-01 14:13:59 -06:00
Erik Johnson
282ec1b8ec Exclude groupinstall alias from docs 2015-05-01 13:38:45 -05:00
Erik Johnson
23a827547c Add docker-ng state docs to toctree 2015-04-30 11:19:37 -05:00
Colton Myers
befb666623 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
    salt/modules/mongodb.py
    salt/utils/http.py
    salt/utils/process.py
    tests/integration/__init__.py
 2015-04-27 10:28:53 -06:00
Colton Myers
a18e017619 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
    doc/man/salt.1
    doc/ref/cli/salt.rst
 2015-04-24 10:07:48 -06:00
Justin
8486e17ab3 Added retry_dns to minion doc. 2015-04-23 15:33:59 -06:00
Jonathan Ballet
19efd419b5 Improve state_output documentation 
List all the available settings in the documentation and on the command
line.
Also, make the documentation clearer about the different possibilities.
 2015-04-23 10:22:11 +02:00
Colton Myers
2210bd175e Merge pull request #22668 from basepi/merge-forward-develop 
Merge forward from 2015.2 to develop
 2015-04-16 23:22:36 -06:00
Erik Johnson
e51a8e0e4a Add external anchor for "reloading modules" section of state docs 2015-04-16 20:17:25 -05:00
Colton Myers
66378be75e Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
    doc/ref/states/requisites.rst
    salt/master.py
    salt/modules/win_pkg.py
 2015-04-16 12:27:53 -06:00
Colton Myers
000de95974 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
    .pylintrc
    doc/ref/runners/all/salt.runners.nacl.rst
    doc/topics/cloud/config.rst
    salt/cli/salt.py
    salt/client/mixins.py
    salt/client/ssh/__init__.py
    salt/loader.py
    salt/minion.py
    salt/modules/cassandra_cql.py
    salt/modules/gpg.py
    salt/modules/grains.py
    salt/modules/iptables.py
    salt/modules/yumpkg.py
    salt/netapi/rest_cherrypy/app.py
    salt/renderers/pyobjects.py
    salt/returners/mysql.py
    salt/runners/jobs.py
    salt/state.py
    salt/states/file.py
    salt/states/service.py
    salt/utils/minions.py
    tests/integration/__init__.py
    tests/integration/netapi/rest_tornado/test_app.py
    tests/integration/states/cmd.py
 2015-04-16 12:15:44 -06:00
Thomas S Hatch
b6e803910f Merge pull request #22753 from thatch45/doc_clear 
fix some bad sls data in a doc
 2015-04-16 11:58:17 -06:00