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
91,671 Commits 24 Branches 182 Tags 341 MiB
05d4d104d2
Commit Graph

98 Commits

Author SHA1 Message Date
Andrew Pashkin
b0148c15c7 Revert "Make possible to reference previous pillars from subsequent pillars, as they specified in the top file" 2017-07-19 12:25:22 +03:00
Andrew Pashkin
7d59f7a6c6 Make possible to reference pillars, that come before current pillar in the top file 2017-07-12 19:03:05 +03:00
rallytime
c5b75d030a Update Nitrogen references to 2017.7.0 in doc/* 2017-06-14 11:36:06 -06:00
rallytime
caebd5d8cf Merge branch '2016.11' into 'develop' 
Conflicts:
  - doc/topics/targeting/nodegroups.rst
  - salt/runners/manage.py
 2017-03-16 17:23:57 -06:00
rallytime
72d16c9fa9 Update "yaml" code-block references with "jinja" where needed 
There are many `.. code-block: yaml` definitions that should really
be `.. code-block: jinja` definitions. This commit cleans up some
of those and removes warnings like these from the doc build:

```
WARNING: Could not lex literal_block as "yaml". Highlighting skipped.
```
 2017-03-15 10:22:19 -06:00
Erik Johnson
8277e42bc1 Add pillar-environments anchor 2017-02-23 22:14:25 -06:00
rallytime
dda39d4e63 Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/minion.py
  - salt/modules/file.py
  - salt/modules/grains.py
  - salt/utils/gitfs.py
 2017-02-16 12:18:46 -07:00
Erik Johnson
fbd551e069 Add note about using saltenv jinja var in pillar top files 
This adds some useful information to the pillar docs.
 2017-02-09 14:39:09 -06:00
Erik Johnson
18a58b2b63 Document pillar decryption feature in pillar docs 2017-01-31 11:25:58 -06:00
Zac Brachmanis
7ca256ccee Minor spelling correction (#38721) 2017-01-13 14:57:20 -07:00
Erik Johnson
4cbfa9d947 Add pillarenv_from_saltenv to pillar docs 2016-12-22 16:25:29 -06: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
rallytime
d684d49490 Merge branch '2016.3' into 'develop' 
Conflicts:
  - doc/topics/releases/2015.5.10.rst
  - doc/topics/releases/2015.8.8.rst
 2016-03-28 11:16:22 -06:00
rallytime
f6d9cdc633 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - doc/ref/states/compiler_ordering.rst
  - doc/topics/installation/suse.rst
  - doc/topics/jobs/schedule.rst
  - doc/topics/targeting/grains.rst
  - doc/topics/tutorials/preseed_key.rst
  - doc/topics/tutorials/states_pt5.rst
  - pkg/suse/use-forking-daemon.patch
  - salt/minion.py
  - salt/modules/pacman.py
  - salt/modules/state.py
  - salt/modules/yumpkg.py
 2016-03-25 11:47:16 -06:00
rallytime
7554d0f42d Merge branch '2015.5' into '2015.8' 
Conflicts:
  - doc/ref/states/include.rst
  - doc/topics/cloud/reactor.rst
  - doc/topics/reactor/index.rst
  - doc/topics/releases/2015.5.10.rst
  - doc/topics/tutorials/states_pt5.rst
  - doc/topics/windows/windows-package-manager.rst
  - salt/config.py
  - salt/modules/state.py
  - salt/states/grains.py
  - tests/integration/modules/sysmod.py
  - tests/unit/states/grains_test.py
 2016-03-24 15:48:00 -06:00
Thomas Güttler
4aec2c502d removed "all": pillar is about "particular minion" 2016-03-22 21:16:34 +01:00
Erik Johnson
1b97e4a3df Improve state module docs, replace references to state.highstate/state.sls with state.apply 
Resolves #32037.
 2016-03-21 22:56:17 -05:00
Bruno P. Kinoshita
fa921e6e8b Fix typo in pillar docs 
Trivial typo, s/pacakges/packages/g
 2016-03-18 10:29:34 +13:00
Colton Myers
076b49a4ca Merge remote-tracking branch 'upstream/2015.8' into merge-forward-2016.3 
Conflicts:
    README.rst
    doc/conf.py
    doc/ref/index.rst
    doc/ref/proxy/all/salt.proxy.ssh_sample.rst
    doc/topics/installation/rhel.rst
    doc/topics/releases/2015.8.4.rst
    doc/topics/tutorials/states_pt5.rst
    salt/cloud/clouds/ec2.py
    salt/cloud/clouds/opennebula.py
    salt/config/__init__.py
    salt/modules/boto_dynamodb.py
    salt/modules/boto_ec2.py
    salt/modules/boto_elasticache.py
    salt/modules/boto_elb.py
    salt/modules/boto_iam.py
    salt/modules/boto_rds.py
    salt/modules/boto_sns.py
    salt/modules/boto_sqs.py
    salt/modules/dracr.py
    salt/modules/git.py
    salt/modules/mine.py
    salt/modules/systemd.py
    salt/modules/win_pkg.py
    salt/modules/yumpkg.py
    salt/pillar/__init__.py
    salt/states/git.py
    salt/states/rabbitmq_vhost.py
    salt/states/saltmod.py
    salt/utils/pkg/rpm.py
    setup.py
    tests/unit/modules/systemd_test.py
    tests/unit/states/rabbitmq_vhost_test.py
 2016-02-11 22:33:49 -07:00
Mike Place
3ff7d49555 Note that pillar cli args are sent via pub 2016-02-05 10:54:16 -07:00
Jacob Hammons
b192a9ba38 Doc restructuring, organization, and cleanup. Updated the doc navigation. 2016-01-31 20:10:02 -07:00
Jonathan Ballet
5aa0e9b1e0 Fix documentation typo for pillars 2015-12-21 13:26:02 +01:00
rallytime
45080f3629 Add examples of using multiple matching levels to Pillar docs 
Fixes #29091
 2015-12-15 14:57:36 -07:00
twangboy
7bdddaca53 Fixed grammer 2015-12-03 11:18:32 -07:00
twangboy
d965d00a09 Fix #19332 
Clarified precedence of pillar values
 2015-12-03 11:15:46 -07:00
Colton Myers
c4c889f97b Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/conf.py
    salt/daemons/masterapi.py
    salt/minion.py
 2015-10-20 14:47:49 -06:00
Jacob Hammons
2870af2ba3 added link to grains security FAQ to targeting and pillar topics. 2015-10-15 15:05:35 -06:00
Colton Myers
35425b14ad Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/man/salt-api.1
    doc/man/salt-call.1
    doc/man/salt-cloud.1
    doc/man/salt-cp.1
    doc/man/salt-key.1
    doc/man/salt-master.1
    doc/man/salt-minion.1
    doc/man/salt-run.1
    doc/man/salt-ssh.1
    doc/man/salt-syndic.1
    doc/man/salt-unity.1
    doc/man/salt.1
    doc/man/salt.7
    salt/modules/pip.py
    salt/states/user.py
 2015-10-07 12:06:12 -06:00
Jacob Hammons
76dc8de71b Assorted doc bugs 
Refs #9051
Refs #13407
Refs #21475
Refs #14876
Refs #27005
 2015-10-05 17:37:13 -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
Mike Place
8cef61e6cc pillar doc fix 
closes #25413
 2015-07-22 16:56:53 -06:00
Dennis
9081a7d391 s/respctively/respectively 2015-06-23 18:24:06 -07:00
Colton Myers
d17c908b42 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
	doc/topics/pillar/index.rst
	salt/beacons/diskusage.py
	salt/beacons/network_info.py
	salt/minion.py
	salt/modules/iptables.py
	salt/modules/nacl.py
	salt/modules/win_firewall.py
 2015-03-09 12:52:14 -06:00
s8weber
ad869c74b1 add pillar_safe_render_error config 
allow a salt admin to config if the detailed render error of pillars
can be passed to the minion.
 2015-03-04 10:22:29 -05:00
Diego Woitasen
e6f64019a8 How to store Minion config options on Pillars. 2015-02-02 09:27:13 -03:00
Colton Myers
fc16bd16c0 Merge branch '2014.7' into merge-forward 
Conflicts:
	doc/faq.rst
	doc/ref/states/compiler_ordering.rst
	doc/topics/best_practices.rst
	doc/topics/development/conventions/formulas.rst
	salt/config.py
	salt/modules/state.py
	salt/states/mount.py
	salt/utils/event.py
	tests/unit/utils/process_test.py
 2014-12-16 14:45:25 -07:00
Seth House
51fa87c446 Change all state examples to use short-dec format for consistency 
Closes #12419.

The command used to search the docs for state examples is below. This
generates a file in Vim's quickfix format that can be loaded with the -q
flag.

find . -type f \( -name '*.rst' -o -name '*.py' \) -print0
    | xargs -0 -P10 -n1 awk '
        BEGIN { RS=""; FS="\n" }
        { linenr = linect; linect += (NF + 1) }
        /^\s+[a-zA-Z0-9'\''_-]+:\n\s+[a-zA-Z0-9'\''_-]+:\n\s+- / {
            print FILENAME "|" linenr + 2 "|", $1
        }
    ' > ./salt-states.quickfix
 2014-12-12 23:36:40 -07: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
Steve Weber
88f28b90fb doc fix 
doc fix
 2014-09-26 09:28:16 -04:00
Thomas Martin
7cc5446484 Fix incorrect path in Pillar documentation 2014-09-22 09:04:48 +02:00
Henrik Holmboe
c43a99242c Minor doc change 2014-09-04 17:27:02 +02:00
Nitin Madhok
ef05362c6c Fixing more sphinx errors and violations 2014-09-03 16:05:36 -06:00
Erik Johnson
892a78ea1c Double-backticks for formatting consistency 2014-09-01 15:07:03 -05:00
Jille Timmermans
30bce1dafa Small documentation fix in pillars 2014-09-01 13:13:12 +02:00
Nitin Madhok
b526ee2aab Fixing more sphinx errors and violations 2014-09-01 02:44:27 -04:00
Mike Place
65f232e066 Docs on merging pillar keys 
Refs #14916
 2014-08-26 15:48:51 -06:00
David Boucha
859eaa1468 add example of pillar on the Cli 2014-08-25 14:05:39 -06:00
David Boucha
8da4eb3ab5 fix whitespace issues 2014-08-25 14:01:16 -06:00
David Boucha
c016bf5db2 remove whitespace 2014-08-25 13:59:16 -06:00