This test isn't available in certain popular versions of Jinja (namely the one
installed by default in CentOS 6).

Improve flexibility/quality of pygit2 state

Configure the salt-api service to start at boot time

Only watch salt-api package if install_packages=true

Also watch salt-api pkg instead of salt-master one.

Fixed pillar_roots generation for salt-master.

With a simple pillar like this::

    $ sudo salt-call --config-dir /srv/etc/bootstrap --pillar-root /srv/pillar pillar.get salt:pillar_roots
    local:
        ----------
        base:
            - /srv/pillar

This was generated in /etc/salt/master.d/f_defaults.conf::

    # highstate format, and is generally just key/value pairs.
    pillar_roots:base:- /srv/pillar
    #

Resulting in parse errors by salt::

    $ sudo salt '*' state.highstate
    [ERROR   ] Error parsing configuration file: /etc/salt/master.d/f_defaults.conf - while scanning a simple key
      in "<string>", line 531, column 1:
        pillar_roots:base:- /srv/pillar
        ^
    could not found expected ':'
      in "<string>", line 532, column 1:
        #
        ^
    [ERROR   ] Error parsing configuration file: /etc/salt/master.d/f_defaults.conf - while scanning a simple key
      in "<string>", line 531, column 1:
        pillar_roots:base:- /srv/pillar
        ^
    could not found expected ':'
      in "<string>", line 532, column 1:
        #
        ^

This patch will fix it as such::

          ID: salt-master
    Function: file.recurse
        Name: /etc/salt/master.d
      Result: True
     Comment: Recursively updated /etc/salt/master.d
     Started: 11:37:12.946823
    Duration: 6255.296 ms
     Changes:
              ----------
              /etc/salt/master.d/f_defaults.conf:
                  ----------
                  diff:
                      ---
                      +++
                      @@ -528,7 +528,9 @@
                       # Pillar is laid out in the same fashion as the file server, with environments,
                       # a top file and sls files. However, pillar data does not need to be in the
                       # highstate format, and is generally just key/value pairs.
                      -pillar_roots:base:- /srv/pillar
                      +pillar_roots:
                      +  base:
                      +    - /srv/pillar
                       #

Resulting in::

    # highstate format, and is generally just key/value pairs.
    pillar_roots:
      base:
        - /srv/pillar
    #

Add options for mult-master setup

Use the py27-pygit2 package when installing pygit2 on FreeBSD

Use the py27-GitPython package when installing GitPython on FreeBSD

Use the py27-salt package when installing salt-ssh on FreeBSD

This key defaults to a value of `python-git`.

On FreeBSD salt-ssh gets bundled into a single package with the other
SaltStack components (minion, master, etc.).

Revert bad

This reverts commit 7bb82b0178.

This reverts commit 8a1b8dc9db.

This reverts commit 90282eff03.

This reverts commit c5ae289fa1.

This reverts commit b03831c0b0.

This reverts commit 22b8dde1ff.

This reverts commit 14b466e022.

Add support for GitPython and salt-ssh on FreeBSD masters

Done at the maintainer's request.

salt.api state fails

Seems there are several colons missing for salt.api to work correctly, hope I found all of them

This change tweaks the GitPython package installation state to support
alternate package names (on FreeBSD, it's called "py27-GitPython").
Also, on FreeBSD salt-ssh is included in the "py27-salt" package by
default, requiring an update to `distro_map`.

Fix stuff suggested by @iggy.

Signed-off-by: René Jochum <rene@jochums.at>

Install cherrypy/tornado from pip only if use_pip is True for salt-api.

Signed-off-by: René Jochum <rene@jochums.at>

Advance salt/api.sls, install rest_cherrypy or rest_tornado from pip.

Signed-off-by: René Jochum <rene@jochums.at>

Signed-off-by: René Jochum <rene@jochums.at>

Updated master.d/f_defaults for 2014.7

Fix syntax error

Fix syndic requisites

The syndic service was depending upon itself, which caused the salt run
to fail. This commit fixes that by depending on the salt-master service
rather than the salt-syndic service. I also made it more general by
using IDs to specify the provider rather than the name, which is a bit
less reliable.

formulas.jinja: python 2.6 support