2
0
salt-formula/salt
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
..
files Fixed pillar_roots generation for salt-master. 2015-08-06 11:37:55 +02:00
gitfs Allow customizing the GitPython package name. 2015-07-24 16:31:00 -04:00
pkgrepo Remove hardcoded paths with {{ slspath }} variable 2015-06-09 23:05:49 +02:00
api.sls Revert "Advance sal/api.sls, install rest_cherrypy or rest_tornado from pip." 2015-07-20 17:05:57 -05:00
cloud.sls Remove hardcoded paths with {{ slspath }} variable 2015-06-09 23:05:49 +02:00
defaults.yaml Add new salt:python_git key. 2015-07-24 16:27:52 -04:00
formulas.jinja formulas.jinja: python 2.6 support 2015-06-17 17:12:28 +03:00
formulas.sls formulas.jinja: python 2.6 support 2015-06-17 17:51:40 +03:00
map.jinja Use the py27-pygit2 package when installing pygit2 on FreeBSD 2015-07-24 17:06:15 -04:00
master.sls Remove hardcoded paths with {{ slspath }} variable 2015-06-09 23:05:49 +02:00
minion.sls Remove hardcoded paths with {{ slspath }} variable 2015-06-09 23:05:49 +02:00
ssh.sls Remove hardcoded paths with {{ slspath }} variable 2015-06-09 23:05:49 +02:00
standalone.sls Remove hardcoded paths with {{ slspath }} variable 2015-06-09 23:05:49 +02:00
syndic.sls Fix syntax error 2015-06-19 15:33:16 -06:00