valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
92,064 Commits 24 Branches 182 Tags 341 MiB
a173246bdf
Commit Graph

142 Commits

Author SHA1 Message Date
Colton Myers
2907a64052 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    salt/cli/batch.py
    salt/modules/git.py
    salt/utils/event.py
 2015-08-20 13:31:46 -06:00
Jacob Hammons
499bd66378 Minor doc bug fixes 
Refs #26403
Refs #26432
Refs #26233
Refs #26264
Refs #26329
 2015-08-19 11:31:26 -06:00
rallytime
1b7efa91e0 Remove references to Beryllium in relevant docs 2015-07-08 11:17:01 -06:00
Thomas S Hatch
9ca2d58b10 Merge pull request #23058 from plastikos/improvement-compound_as_list 
[improvement] compound match as list
 2015-04-25 10:57:49 -06:00
Thayne Harbaugh
6f4cfd01fc Specify compound matches as lists 
Compound matches, such as nodegroups, can now be specified as lists.  This
avoids splitting on whitespace which may be part of a key or value.

Right now this only works for nodegroups.  Making the argument to "-C"
(compound list) a JSON argument is a future task.
 2015-04-24 17:00:04 -06:00
Thayne Harbaugh
993373655a Allow grain and pillar delimiter to be specified in compound matcher syntax. 2015-04-23 23:26:49 -06:00
Thayne Harbaugh
bbd063fdee Add a versionadded note for the leading "not" 2015-04-23 22:27:10 -06:00
Thayne Harbaugh
d6fe499f55 Allow compound expressions to begin with "not" 2015-04-22 17:38:17 -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
Thayne Harbaugh
6179839225 Improve documentation for nested nodegroup. 2015-04-09 01:43:18 -06:00
Thomas S Hatch
ecacdcbe75 Merge branch 'develop' of https://github.com/VynceMontgomery/salt into VynceMontgomery-develop 2015-03-09 11:07:14 -06:00
Erik Johnson
0aa1029f24 correction to grains example 2015-03-07 11:40:43 -07:00
Vynce Montgomery
2723cb57a3 finish changing variable name 
a partial edit, renaming a variable for clarity, missed some cases.
 2015-03-06 23:33:05 -08:00
Gabriel Fornaeus
91f58fd5ca Spelling error 2015-02-16 12:05:47 +01:00
Gabriel Fornaeus
5d3dd815b4 Compound match example added 2015-02-16 11:25:05 +01:00
Gabriel Fornaeus
66c2184eb4 Added to main documentation 2015-02-16 11:03:43 +01:00
Colton Myers
9e9a2eab90 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
	salt/fileserver/gitfs.py
	salt/loader.py
 2015-01-23 16:13:30 -07:00
Colton Myers
a067e6ceba Fix the grains precedence documentation 
Fixes #19611
 2015-01-21 16:10:18 -07:00
Thomas Jackson
2fa6dad350 Comma cleanup 2014-12-12 11:39:55 -08:00
Thomas Jackson
498a612078 Whitespace cleanup 
Conflicts:
	doc/topics/cloud/linode.rst
	doc/topics/cloud/misc.rst
	doc/topics/cloud/parallels.rst
	doc/topics/cloud/proxmox.rst

Conflicts:
	doc/topics/development/architecture.rst
	doc/topics/development/translating.rst
 2014-12-11 07:53:19 -08:00
Sandra Kosmalla
2096f2cafd fix syntax error in writing grains code snippet 2014-11-05 15:13:51 -07:00
Sandra Kosmalla
de5baa14a2 fix syntax error in writing grains code snippet 2014-11-05 11:33:14 +01:00
Nitin Madhok
6ce392b236 More sphinx errors and violations 2014-09-03 16:05:07 -06:00
Nitin Madhok
938d8e90ee More sphinx errors and violations 2014-09-01 02:33:15 -04:00
Alex Kelly
1a943480e9 Added some very basic information about actually writing grains in the 
"writiing grains" section
 2014-08-26 16:45:31 -04:00
Chris Rebert
a53ae15d23 copyedits 2014-08-22 11:59:13 -07:00
Seth House
4abc45397d Merge remote-tracking branch 'upstream/2014.7' into develop 2014-08-21 13:23:52 -06:00
Mike Place
94543fe68d Document seco range 
Per request in #15093
 2014-08-20 11:54:29 -06:00
Sylvain Bellemare
9f6ecc4874 Removed duplicate occurrences of the word "the" 2014-08-11 16:05:29 +02:00
Erik Johnson
a1f5be53dc Remove pillar page from targeting toctree 2014-06-17 17:23:31 -05:00
Erik Johnson
5688da134d Remove pillar targeting page 
There is already a section for this in the Pillar page, no need for a
dedicated page.
 2014-06-17 17:21:22 -05:00
Erik Johnson
2a5698b6ab Add external ref target for batching page 2014-06-17 17:20:50 -05:00
Erik Johnson
3a61446f06 Add new pages to targeting toctree 2014-06-17 17:20:49 -05:00
Erik Johnson
40d96af27c Add new docs pages for pillar and ipcidr matchers 2014-06-17 17:20:49 -05:00
rallytime
1612be139f Added note about grain lowercase resolution 2014-06-13 16:03:38 -06:00
Erik Johnson
3ca776a167 Add reactor example for syncing custom types on initial highstate 2014-06-07 14:27:26 -05:00
Michael Lustfield
5eab3db366 minor doc touchups 2014-05-24 23:42:00 -05:00
Mike Place
63838373a5 Doc fix. 
Resolves #6612
 2014-05-15 12:08:19 -06:00
Chris Rebert
8af229253f more copyediting 2014-04-30 13:55:48 -07:00
Chris Rebert
45981a56f9 lots of copyediting 2014-04-30 12:06:27 -07:00
Pedro Algarvio
3cd612d2c4 Fix compound example. 
Refs 11195cbd2d
 2014-04-15 10:55:26 +01:00
Thomas S Hatch
a3faf17f10 Merge pull request #11976 from cachedout/nodegroups_doc 
Add note about master restart per nodegroups.
 2014-04-14 14:21:18 -06:00
Mike Place
e3504e5a02 Add note about master restart per nodegroups. 
Pointed out here:
https://khsing.net/2014/04/11/fight-with-saltstack-no-top-file-or-external-nodes-data-matches-found/
 2014-04-14 09:39:31 -06:00
Mike Place
11195cbd2d Fix compound matching with parens. 2014-04-11 11:33:19 -06:00
Seth House
c9f2830637 Added ref anchors for the various targeting types 2014-02-27 19:38:57 -07:00
Seth House
bf9ae06cc6 Removed old, scattered glossary entries 2014-02-27 19:38:56 -07:00
Mike Place
6af7ff5dff First pass at refactoring Salt documentation. 2014-02-26 13:31:11 -07:00
Erik Johnson
ccc7665c42 Tweak docs for consistency and correctness 
The grains example would traceback if the grain was not defined, so I
have replaced this example with a better one. Also made a few changes
for consistency in formatting, and made a couple terms into links to the
relevant documentation.
 2014-02-23 10:19:10 -08:00
Forrest Alvarez
c8416f9b6d Updated the globbing doc with a link to compound matching, updated the compound matchin doc with another example, 2014-01-17 05:56:59 +00:00
Forrest Alvarez
9429458ff9 updated globbing docs with an extra example 2013-12-19 06:23:00 +00:00
Forrest Alvarez
da7fa38d0e Updated nodegroups with a few clarifications, updated halite docs with a new section on installing via RPM, when the .deb is done another section needs to be added. 2013-11-07 04:50:13 +00:00
Erik Johnson
3e7f48dd2c Clarify grains precedence 
Resolves #8107.
 2013-11-03 13:31:01 -06:00
Mike Place
d583554143 Documentation clarification to make the explanation of /etc/salt/grains more specific. 2013-10-17 15:49:14 -06:00
Joe Healy
aece0976a6 Fixed pedantic spelling errors picked up by lintian 
joe@unstable-builder:~/salt_017rc/salt$ lintian -I ../*.deb
I: salt-common: spelling-error-in-manpage usr/share/man/man7/salt.7.gz softwares software - done
I: salt-common: spelling-error-in-manpage usr/share/man/man7/salt.7.gz specifed specified - done
I: salt-common: spelling-error-in-manpage usr/share/man/man7/salt.7.gz Targetting Targeting - done
I: salt-common: spelling-error-in-manpage usr/share/man/man7/salt.7.gz targetted targeted - done
I: salt-common: spelling-error-in-manpage usr/share/man/man7/salt.7.gz Dependant Dependent - done
I: salt-common: FSSTND-dir-in-manual-page usr/share/man/man7/salt.7.gz:57301 /var/named/ - not done - example
I: salt-common: FSSTND-dir-in-manual-page usr/share/man/man7/salt.7.gz:57320 /var/named/ - not done - example
I: salt-common: FSSTND-dir-in-manual-page usr/share/man/man7/salt.7.gz:57339 /var/named/ - not done - example
I: salt-common: spelling-error-in-manpage usr/share/man/man7/salt.7.gz recieve receive - done
I: salt-common: spelling-error-in-manpage usr/share/man/man7/salt.7.gz allows to allows one to - done
I: salt-common: spelling-error-in-manpage usr/share/man/man7/salt.7.gz allows to allows one to - done
I: salt-common: spelling-error-in-manpage usr/share/man/man7/salt.7.gz dont don't - done
I: salt-common: spelling-error-in-manpage usr/share/man/man7/salt.7.gz succesfully successfully - done
I: salt-common: spelling-error-in-manpage usr/share/man/man7/salt.7.gz softwares software - done
I: salt-common: spelling-error-in-manpage usr/share/man/man7/salt.7.gz These package This package - not done - legitimate
 2013-09-20 22:01:20 +10:00
Colton Myers
0acf9a5383 Remove deprecated matchers from compound matcher 2013-08-29 11:26:59 -06:00
Marc Liyanage
1dfdd943af Small documentation tweak, started out by replacing "it's" with "its" and added some other minor changes. 2013-08-23 13:38:10 -07:00
Erik Johnson
177d4009a2 Cleanup docstrings in modjk state/module 
Fixed spelling/grammar errors, improved formatting, and introduced links
to improve doc navigation.
 2013-08-13 11:39:26 -05:00
Erik Johnson
9c63495e04 Formatting fixes 
This completes the documentation audit begun in cf365f7, using proper
backticks and :strong: tags to emphasize text, converting groups of
shell commands to bash code-block sections, etc. This also replaces the
use of \* with the easier-to-grok '*', which will hopefully reduce
confusion among new users.
 2013-08-11 22:17:47 -05:00
Erik Johnson
cf365f77cd Convert shell command examples to bash code-block 
This commit modifes a number of files which have command-line examples
so that the code-block directive is used. This provides more
visually-appealing syntax highlighting.

More commits like this will follow, this commit is part of an overall
documentation audit that I am performing.
 2013-08-10 21:55:51 -05:00
Jason Swindle
4c5da1347e Updating Grains doc to show JINJA in Top file matching with grains. 2013-07-27 16:51:07 -05:00
Pedro Algarvio
c535854871 Link to the fnmatch and re modules. 2013-07-23 18:31:21 +01:00
Pedro Algarvio
9ab3b7a1df Link to the fnmatch and re modules. 2013-07-23 18:22:52 +01:00
Pedro Algarvio
d7cbf107ce Link dict to the python documentation. 2013-07-23 18:07:58 +01:00
Erik Johnson
11b79f9bce Document defining custom grains in /etc/salt/grains 2013-07-07 23:23:27 -05:00
Erik Johnson
88d7839cef Replace 2nd-person wording 
This commit re-does the updates from #5536 without using 2nd-person
pronouns.
 2013-06-13 21:05:19 -05:00
Erik Johnson
b26bf3e4a8 Add examples of targeting nested grains 2013-06-13 20:28:11 -05:00
Colton Myers
8b24dbc09a Explain how to do a leading not in compound matcher 2013-05-16 11:06:17 -06:00
Sean Channel
4ab4ff4021 fix column alignment 2013-03-20 17:54:39 -07:00
Thomas Jackson
98a969b45e Add minion data to the compound matcher 2013-03-20 12:56:38 -07:00
Gary Wilson Jr
bd499e5640 Fixed several minor misspellings and acronym capitalizations. 2013-03-18 16:42:57 -05:00
Pete Emerson
4273fd5831 Fix typo in grains.rst 2013-03-07 14:27:22 -08:00
Pete Emerson
88d25814d0 Listing grains and grain data 2013-03-07 13:32:46 -08:00
Erik Johnson
d4b120a003 Replace hard-coded links w/relative ":mod:" links 2013-02-03 14:54:04 -06:00
jacksontj
2af3304a44 Update doc/topics/targeting/compound.rst 2013-01-21 09:10:52 -08:00
jacksontj
745507bab5 Update doc/topics/targeting/compound.rst 
Fixing formatting
 2013-01-21 09:10:44 -08:00
Thomas Jackson
ebbe102fe5 Adding range to compound matcher 
Adding docs for range compound matcher
 2013-01-18 17:54:48 -08:00
Alejandro Gómez
3b6af979bc Fix typo in example 2013-01-05 19:06:31 +01:00
Erik Johnson
5def1dd54c Updated docs for grains, modules, and states 
Added links to module function documentation, as well as to
"file_roots", and mentioned the saltutil.sync_* functions. Will probably
do the same for returners and renderers soon. This should help people
navigate through the docs easier.
 2012-12-18 23:29:36 -06:00
Denis Generalov
585f46d859 one_fqdn AND other_fqdn will always return empty set 2012-12-04 03:21:15 +04:00
Seth House
4d35f129f6 Added glossary entry for grains 2012-10-11 00:22:01 -06:00
Seth House
4246b27ff0 Fixed misc rST syntax errors 2012-10-04 18:52:51 -06:00
Erik Johnson
3eed6c857e Add Subnet/IP address matcher 
This implements #653. Note that there appears to be an underlying
problem with how highstates instantiate Matcher objects, which is
keeping this from working in an SLS file. See issue #2167 for more
details on that.
 2012-10-04 13:02:59 -05:00
Thomas S Hatch
b9c2d913b6 Add a ref to compount targets 2012-08-01 11:11:40 -06:00
Seth House
4b15fb7f0e Fixed several link target syntaxes 2012-06-10 09:23:42 -07:00
Seth House
345df8b64a Added docs for firewalling, batching, and running without root to TOC 2012-06-10 09:21:46 -07:00
Thomas S Hatch
59693d4607 Add pillar match to compound matcher doc 2012-05-23 10:22:13 -06:00
L.C. Rees
3315dad9e7 documentation updates 2012-05-22 22:43:12 -06:00
Vitaliy Fuks
2991ab39d6 Targetting->Grains did not actually document how to target minions based on grains data. 2012-05-06 14:46:08 -04:00
Thomas S Hatch
979fef65af Add batch.rst, Fix #1039 2012-04-03 09:49:39 -06:00
Jeff Schroeder
b005cee70f Slightly expand docs on the various other compound matchers 2012-04-02 22:17:42 -07:00
Gordon McAllister
72c2014767 War on typos 
Also cleanup whitespace and break some long lines
 2012-03-14 17:09:19 -07:00
Seth House
084f8a7259 Added and organized documents on ways of targeting minions 2012-02-25 01:15:57 -07:00