Commit Graph

4644 Commits

Author SHA1 Message Date
Thomas S Hatch
f3ce7147de Merge branch 'develop' of github.com:saltstack/salt into develop 2012-05-18 18:14:37 -06:00
Thomas S Hatch
0b9bc8a806 Add clan warning to logfile perms issues
Fix #1292
2012-05-18 18:13:40 -06:00
Thomas S Hatch
264d5faac1 Merge pull request #1299 from rentalita/pillar-matcher
Copy grain matcher to create pillar matcher.
2012-05-18 16:40:54 -07:00
Thomas S Hatch
db6c413e89 clean up freebsdpkg search function name 2012-05-18 17:36:01 -06:00
Thomas S Hatch
833683f9c3 Merge pull request #1297 from kvelarde/develop
Adding pkgng search function to check remote repos
2012-05-18 16:32:13 -07:00
Tom Vaughan
3642ca5e3f Copy grain matcher to create pillar matcher.
First, please see the pillars documentation:
http://salt.readthedocs.org/en/latest/topics/pillar/index.html. Next,
perhaps an example will explain this best...

Let's say you have a `/src/pillar/top.sls` that looks like:

    base:
      'hostname1':
        - production
      'hostname2':
        - development

And a `/srv/pillar/production.sls` that looks like:

    role: production
    countrycode: us

And a `/srv/pillar/development.sls` that looks like:

    role: development
    countrycode: cl

This means that `/srv/salt/top.sls` could now look like:

    base:
      '*':
        - ssh
      'role:production':
        - match: pillar
        - users.production
        - default
        - clojure
      'role:development':
        - match: pillar
        - users.development
        - default.dev
        - clojure.dev

Both `role` and `countrycode` may also be used as a template variable
as explained in the pillar documentation above.

For a real-world example, please see:

 * https://github.com/rentalita/ubuntu-setup
 * https://github.com/rentalita/ubuntu-setup/blob/master/salt/apt/init.sls.
 * https://github.com/rentalita/ubuntu-setup/blob/master/salt/apt/sources.list

This commit also extends the salt command-line client so that it too
may use the pillar matcher, like:

    salt -I 'role:production' test.ping

Documentation and tests are not included in this commit. These will
come in a later commit.

The `pillar_match` routine is simply a copy of the `grain_match`
routine. But I grep'd for the `exsel` matcher to figure out what parts
of the code needed to be touched in order to (hopefully) make this
work. I suppose a pillar pcre matcher could be made just as easily.
2012-05-18 10:20:22 -04:00
Thomas S Hatch
258a438aae Merge pull request #1298 from therek/develop
New methods for freebsdjail.py
2012-05-18 06:44:05 -07:00
Cezary Morga
b01b4ca0b0 Add sysctl method for dumping all jail related sysctl's 2012-05-18 13:28:24 +02:00
Cezary Morga
0fa724ef72 Add jail.fstab to dump specified jail's fstab file 2012-05-18 12:26:07 +02:00
Cezary Morga
1baeffad0c Add jail's status check 2012-05-18 11:24:42 +02:00
Kurtis Velarde
ddf7e07b17 Adding pkgng search function to check remote repos 2012-05-17 16:38:17 -07:00
Jeff Schroeder
987faa5772 Merge pull request #1296 from kvelarde/develop
Develop
2012-05-17 16:14:55 -07:00
Kurtis Velarde
9257d0342f Updating check so pkgng can be run without ports installed 2012-05-17 15:45:58 -07:00
Jeff Schroeder
44e81fa45d Adding @mattmcclean's openstack salt states
OpenStack salt states are asked about frequently, here are some examples.
2012-05-17 13:41:39 -07:00
Thomas S Hatch
c2c3ef0712 Merge pull request #1295 from sharpone74/develop
Small change in upstart.py service module to correctly report a target service start/stop status.
2012-05-16 22:52:42 -07:00
Justin Sharp
be16c59dfb Change the order of checking ubuntu's service scripts for type (upstart/sysv) when getting status 2012-05-16 23:39:52 -06:00
Thomas S Hatch
a4864f9c80 Add initial compiler tests 2012-05-16 23:00:01 -06:00
Thomas S Hatch
fdf155bbe2 Add interface for testing bad sls data 2012-05-16 22:58:18 -06:00
Thomas S Hatch
76efdd9fb0 Fix bug in tests with aliases 2012-05-16 22:49:19 -06:00
Kurtis Velarde
ac0a57fa26 Fixing doc string and output 2012-05-16 21:08:59 -07:00
Thomas S Hatch
417a23be72 Merge pull request #1294 from kvelarde/develop
First commit for rabbitmq module
2012-05-16 21:02:56 -07:00
Kurtis Velarde
5852cdcd2c Updating delete user doc string and output 2012-05-16 20:38:03 -07:00
Kurtis Velarde
c9ed68b92a Adding better doc strings and output for list_vhosts 2012-05-16 20:01:07 -07:00
Kurtis Velarde
a4456b5602 Woops forgot to prepend rabbitmqctl to list_users() 2012-05-16 19:17:28 -07:00
Kurtis Velarde
81bca9cbde First commit for rabbitmq module 2012-05-16 17:03:25 -07:00
Thomas S Hatch
f1b086de89 Merge pull request #1287 from padelt/develop
Clarify pillar use for files managed on minions that include pillar key/...
2012-05-16 07:38:37 -07:00
Jeff Schroeder
cba4679b18 Merge pull request #1289 from bastichelaar/develop
Expr_form is not passed through with publish module
2012-05-16 05:08:49 -07:00
bastichelaar
b969fd2760 Referenced the wrong variable 2012-05-16 14:32:58 +03:00
bastichelaar
9add19bcde Expr_form is not passed through with publish module 2012-05-16 14:26:52 +03:00
Philipp Adelt
b2dad7920d Clarify pillar use for files managed on minions that include pillar key/value data 2012-05-16 12:58:35 +02:00
Thomas S Hatch
dead135744 Merge pull request #1286 from kvelarde/develop
Develop
2012-05-15 23:04:10 -07:00
Kurtis Velarde
4518cd7f7f Forgot to add a return for pkgng_update without this call hangs 2012-05-15 18:00:49 -07:00
Kurtis Velarde
7893d3968c Adding -y to pkgng install and purge methods 2012-05-15 17:43:11 -07:00
Kurtis Velarde
10dc7ad615 Adding pkg_update call to get latest repo.txz file.
When rebuilding your package repo all minions will have to have
pkg_update run so they have access to the latest repo listing.
2012-05-15 14:39:55 -07:00
Jeff Schroeder
67c399a3f7 Merge pull request #1283 from hathawsh/develop
Fix NameErrors in yaml_mako.
2012-05-15 11:06:40 -07:00
Shane Hathaway
47aea9dc7b Fix NameErrors. 2012-05-15 11:23:34 -06:00
Thomas S Hatch
5f9a7e87e4 Initial host state test 2012-05-14 23:56:45 -06:00
Thomas S Hatch
26bcb2a4cf Add state_result method to ModuleCase
This makes getting the result field out of the return from run_state
easier
2012-05-14 23:43:16 -06:00
Thomas S Hatch
1c1c99039b Merge pull request #1280 from dcolish/develop
When stdout is part of a pipeline disable color output
2012-05-14 22:04:56 -07:00
Dan Colish
2f992e85da Merge branch 'develop' of git://github.com/saltstack/salt into develop 2012-05-14 22:03:25 -07:00
Dan Colish
ac80940343 Issue #1140, disable color output when stdout is part of a pipeline and not a tty 2012-05-14 22:02:18 -07:00
Thomas S Hatch
5e7f642e4c Merge pull request #1279 from dcolish/develop
Declare out in local client sys.doc
2012-05-14 21:41:04 -07:00
Dan Colish
e6c4e38951 Merge branch 'develop' of git://github.com/saltstack/salt into develop 2012-05-14 21:32:29 -07:00
Dan Colish
5b7c943299 Fix #1234, define out to ensure no unbound vars.
When there are no minions to check for docs, out will be undefined.
2012-05-14 21:31:22 -07:00
Thomas S Hatch
56561149a5 Add standalone minion to contents 2012-05-14 13:40:28 -06:00
Thomas S Hatch
6bfa7de00d Merge branch 'develop' of github.com:saltstack/salt into develop 2012-05-14 13:36:36 -06:00
Thomas S Hatch
fd17c6a1dd Add doc for standalone minion 2012-05-14 13:33:20 -06:00
Thomas S Hatch
21646fd14e Merge pull request #1277 from uggedal/develop
Include my salt states as community examples.
2012-05-14 12:31:08 -07:00
Eivind Uggedal
aee8687c2b Include my salt states as community examples.
Some are arch linux specific, but most could easily be generalized.
Some highlights:

  * going
  * gunicorn
  * iptables
  * nginx
  * phantomjs
  * postgresql
  * redis
  * salt
  * ssh
  * tarsnap
2012-05-14 21:23:58 +02:00
Kurtis Velarde
3b60a3523a Over looked another pkg call: s/pkg_delete/pkg delete/ 2012-05-14 11:24:13 -07:00