saltstack-formulas/salt-formula
Template
2
0
Fork 0
Code Releases Activity
504 Commits 3 Branches 68 Tags 2 MiB
85597b3326
Commit Graph

504 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
jpic
825fd7cd77 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
    #
 2015-08-06 11:37:55 +02:00
Matthew X. Economou
c014015e79 Configure the salt-api service to start at boot time 2015-08-02 21:17:36 -04:00
Krzysztof Pawłowski
3f9e4fc7d4 Fix for centos5 and jinja < 2.6 2015-07-30 10:45:20 +02:00
genus
4ff1a746d6 Add master_type option 2015-07-29 19:48:56 +03:00
puneet kandhari
2af4bf3bb5 Merge pull request #161 from genuss/sign_pubkey 
Add options for mult-master setup
 2015-07-27 06:58:48 -05:00
puneet kandhari
a5923a0df9 Merge pull request #160 from irtnog/fix-freebsd-pygit2-package 
Use the py27-pygit2 package when installing pygit2 on FreeBSD
 2015-07-24 16:11:37 -05:00
Matthew X. Economou
ba9cc2605c Use the py27-pygit2 package when installing pygit2 on FreeBSD 2015-07-24 17:06:15 -04:00
Brian Jackson
e7e77d40d9 Merge pull request #158 from irtnog/fix-freebsd-gitpython-package 
Use the py27-GitPython package when installing GitPython on FreeBSD
 2015-07-24 15:54:45 -05:00
Matthew X. Economou
ea5a9f1f2c Merge remote-tracking branch 'upstream/master' into fix-freebsd-gitpython-package 2015-07-24 16:53:24 -04:00
Brian Jackson
bc0776e4e3 Merge pull request #157 from irtnog/fix-freebsd-saltssh-package 
Use the py27-salt package when installing salt-ssh on FreeBSD
 2015-07-24 15:44:52 -05:00
Matthew X. Economou
ef275bd138 Allow customizing the GitPython package name. 2015-07-24 16:31:00 -04:00
Matthew X. Economou
b477990830 Use the py27-GitPython package when installing GitPython on FreeBSD. 2015-07-24 16:30:02 -04:00
Matthew X. Economou
85a426ccdf Add new salt:python_git key. 
This key defaults to a value of `python-git`.
 2015-07-24 16:27:52 -04:00
Matthew X. Economou
5b93601c78 Use the py27-salt package when installing salt-ssh on FreeBSD 
On FreeBSD salt-ssh gets bundled into a single package with the other
SaltStack components (minion, master, etc.).
 2015-07-24 16:11:23 -04:00
genus
a738198d8b Add verify_master_pubkey_sign 2015-07-24 17:58:41 +03:00
genus
fffd30fe17 Add master_sign_pubkey option 2015-07-24 17:41:49 +03:00
puneet kandhari
e5ad08ee1e Merge pull request #156 from iggy/revert_bad 
Revert bad
 2015-07-20 17:10:56 -05:00
Brian Jackson
4c1f57792a Revert "Advance sal/api.sls, install rest_cherrypy or rest_tornado from pip." 
This reverts commit 7bb82b0178.
 2015-07-20 17:05:57 -05:00
Brian Jackson
6e98d508c4 Revert "Fix salt/api.sls." 
This reverts commit 8a1b8dc9db.
 2015-07-20 17:05:57 -05:00
Brian Jackson
d216a3f651 Revert "Install cherrypy/tornado from pip only if use_pip is True." 
This reverts commit 90282eff03.
 2015-07-20 17:05:56 -05:00
Brian Jackson
8448aa4021 Revert "Fix stuff suggested by @iggy." 
This reverts commit c5ae289fa1.
 2015-07-20 17:05:56 -05:00
Brian Jackson
ed3ab22a13 Revert "Add support for GitPython and salt-ssh on FreeBSD masters" 
This reverts commit b03831c0b0.
 2015-07-20 17:05:56 -05:00
Brian Jackson
f9cb912a65 Revert "salt.api state fails" 
This reverts commit 22b8dde1ff.
 2015-07-20 17:05:56 -05:00
Brian Jackson
ef73e4ce98 Revert "Change variable lookup to match usage in other states" 
This reverts commit 14b466e022.
 2015-07-20 17:05:54 -05:00
puneet kandhari
b04fc8c843 Merge pull request #154 from irtnog/add-freebsd-support-saltssh-gitpython 
Add support for GitPython and salt-ssh on FreeBSD masters
 2015-07-14 06:43:03 -07:00
Matthew X. Economou
14b466e022 Change variable lookup to match usage in other states 
Done at the maintainer's request.
 2015-07-14 09:40:16 -04:00
puneet kandhari
af8c157e2b Merge pull request #155 from Oro/patch-1 
salt.api state fails
 2015-07-14 06:36:15 -07:00
Marco Orovecchia
22b8dde1ff salt.api state fails 
Seems there are several colons missing for salt.api to work correctly, hope I found all of them
 2015-07-14 14:21:14 +02:00
Matthew X. Economou
b03831c0b0 Add support for GitPython and salt-ssh on FreeBSD masters 
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`.
 2015-07-14 03:22:28 -04:00
puneet kandhari
96d820a5a0 Merge pull request #152 from pcdummy/master 
Fix stuff suggested by @iggy.
 2015-07-13 13:34:56 -07:00
René Jochum
c5ae289fa1 Fix stuff suggested by @iggy. 
Signed-off-by: René Jochum <rene@jochums.at>
 2015-07-13 22:31:32 +02:00
puneet kandhari
ac7266a515 Merge pull request #151 from pcdummy/master 
Install cherrypy/tornado from pip only if use_pip is True for salt-api.
 2015-07-13 13:13:16 -07:00
René Jochum
90282eff03 Install cherrypy/tornado from pip only if use_pip is True. 
Signed-off-by: René Jochum <rene@jochums.at>
 2015-07-13 22:08:20 +02:00
puneet kandhari
b90fdc6f6a Merge pull request #150 from pcdummy/master 
Advance salt/api.sls, install rest_cherrypy or rest_tornado from pip.
 2015-07-13 07:22:04 -05:00
René Jochum
8a1b8dc9db Fix salt/api.sls. 
Signed-off-by: René Jochum <rene@jochums.at>
 2015-07-13 13:46:17 +02:00
René Jochum
7bb82b0178 Advance sal/api.sls, install rest_cherrypy or rest_tornado from pip. 
Signed-off-by: René Jochum <rene@jochums.at>
 2015-07-13 13:37:10 +02:00
Brian Jackson
779e6c9c63 Merge pull request #122 from matthew-parlette/master 
Updated master.d/f_defaults for 2014.7
 2015-07-07 12:43:01 -05:00
puneet kandhari
c21c204dd5 Merge pull request #147 from quixoten/fix_syntax_error 
Fix syntax error
 2015-06-19 16:42:56 -05:00
Devin Christensen
645b4c65ce Fix syntax error 2015-06-19 15:33:16 -06:00
puneet kandhari
8fcb42819b Merge pull request #146 from quixoten/fix_syndic 
Fix syndic requisites
 2015-06-17 11:28:28 -05:00
Devin Christensen
8479111cbd 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.
 2015-06-17 09:53:31 -06:00
Nitin Madhok
c358d4d1d3 Merge pull request #145 from peterdemin/master 
formulas.jinja: python 2.6 support
 2015-06-17 10:58:07 -04:00
Petr Demin
eb421c676f formulas.jinja: python 2.6 support 2015-06-17 17:51:40 +03:00
puneet kandhari
4eb6d87870 Merge pull request #144 from peterdemin/master 
formulas.jinja: python 2.6 support
 2015-06-17 09:24:31 -05:00
Petr Demin
d4180295e3 formulas.jinja: python 2.6 support 2015-06-17 17:12:28 +03:00
puneet kandhari
975dd08885 Merge pull request #143 from aboe76/slspath_variable 
Remove hardcoded paths with {{ slspath }} variable
 2015-06-09 16:20:47 -05:00
Niels Abspoel
6ec31374cb Remove hardcoded paths with {{ slspath }} variable 2015-06-09 23:05:49 +02:00
Brian Jackson
62a13de7d5 Merge pull request #141 from willshersystems/develop 
The git command line tool is a requirement of pygit2
 2015-06-05 16:37:30 -05:00
Matt Willsher
1cf72d85f8 The git command line tool is a requirement of pygit2 2015-06-05 21:27:01 +01:00
puneet kandhari
8d8371f19d Merge pull request #139 from willshersystems/centos 
Improved support for Enterprise Linux family OSs (CentOS, RHEL etc)
 2015-06-04 09:46:33 -07:00