2
0
Commit Graph

1077 Commits

Author SHA1 Message Date
Forrest
a33937d9e8 Merge pull request #188 from abednarik/fix_deprecated_iteritems_method
Replace deprecated iteritems() with items()
2015-11-16 18:34:28 -08:00
abednarik
8b39b37762 Replace deprecated iteritems() with items() 2015-11-16 22:05:36 -03:00
Forrest
5c960fd2d8 Merge pull request #179 from blast-hardcheese/bugfix/178_master-configs-in-minion
Never fall back to `cfg_salt['master']` in minion config
2015-11-15 12:19:51 -08:00
Devon Stewart
d730d4f2b8 Using cfg_salt['master'] is never the right answer
- When it's iterable, the minion could be running on the master
- When it's a string, there's no advantage over just specifying
  `salt:minion:master`
2015-11-15 12:11:20 -08:00
Forrest
eeb7235ee0 Merge pull request #184 from 0xf10e/master
use salt_settings.syndic_service so state works on FreeBSD, too
2015-11-04 12:26:06 -08:00
Forrest
8d1b382343 Merge pull request #183 from babilen/dev-show-jid
Manage show_jid option in master configuration
2015-10-13 12:00:56 -07:00
puneet kandhari
52803ea883 Merge pull request #185 from babilen/dev-trailing-whitespace
Remove trailing whitespace from master config
2015-10-13 09:09:51 -07:00
Wolodja Wentland
0216d66527 Remove trailing whitespace from master config 2015-10-13 16:37:14 +02:00
root
d7382e2d1f use salt_settings.syndic_service so state works on FreeBSD, too 2015-10-13 15:41:41 +02:00
Wolodja Wentland
52893bc978 Manage show_jid in master configuration
This makes it easier for users to check the status of jobs that ran into
a timeout.
2015-10-13 14:56:51 +02:00
puneet kandhari
8d098484ed Merge pull request #164 from genuss/sign_pubkey
Add master_type option
2015-09-29 09:44:14 -07:00
Brian Jackson
32d2de264f Merge pull request #176 from irtnog/fix-formulas-mapping-values-not-allowed-render-error
Filter all calls to formulas_git_opt through load_yaml
2015-09-03 14:28:56 -05:00
Matthew X. Economou
827ed47a25 Filter all calls to formulas_git_opt through load_yaml
Jinja macros are not actually functions.  The only thing they can return
is a string.  In order to return structured data, the callee must
serialize it, and the caller must deserialize it.  This state formula
uses YAML as the intermediary, hence the occurrence of both the
`|yaml` (callee) and `|load_yaml` (caller) filters in its code.

The post-render "mapping values are not allowed here" error in
*salt/formulas.sls* or the broken rendering of
*salt/files/master.d/f_defaults.conf* happens because invocations of the
`formulas_git_opt` macro in several Jinja `set` statements do not get
deserialized, resulting in the trailing newline followed by three dot
characters (`...`), which YAML uses to signal the end of a document.
Correcting these rendering errors requires adding the necessary
deserialization code at those locations (i.e., filtering the macro call
through `|load_yaml`).
2015-09-03 14:56:45 -04:00
puneet kandhari
4983fc52e9 Merge pull request #174 from spoage/fix-git-id-conflict
Fixed conflict with git-formula
2015-09-02 09:02:06 -05:00
Shane Poage
f0e691fa13 Fixed conflict with git-formula by allowing either inclusion of formula to install git dependency or specify a package name to install with a custom state ID. 2015-09-01 18:33:18 -05:00
Forrest
c2d6e0e49b Merge pull request #173 from iggy/remove-mapping-test
Remove mapping test
2015-08-27 16:28:27 -07:00
Brian Jackson
9779609bc4 Remove mapping test
This test isn't available in certain popular versions of Jinja (namely the one
installed by default in CentOS 6).
2015-08-27 17:37:53 -05:00
Forrest
4c4ace6d55 Merge pull request #171 from spoage/better-pygit2-install
Improve flexibility/quality of pygit2 state
2015-08-20 10:28:07 -07:00
Shane Poage
addc6d5a26 Added logic to properly install pygit2 on ubuntu systems and made the pygit2 installation more flexible in general. 2015-08-20 02:46:16 -05:00
Nitin Madhok
5db269e560 Merge pull request #166 from irtnog/enable-salt-api-service
Configure the salt-api service to start at boot time
2015-08-09 07:58:04 -04:00
puneet kandhari
16ed1bd334 Merge pull request #169 from smlloyd/master
Only watch salt-api package if install_packages=true
2015-08-08 11:53:21 -05:00
Simon Lloyd
02f7b279a1 Only watch salt-api package if install_packages=true
Also watch salt-api pkg instead of salt-master one.
2015-08-08 17:58:45 +02:00
Nitin Madhok
03464977dc Merge pull request #168 from saltstack-formulas/fix_master_pillar_root
Fixed pillar_roots generation for salt-master.
2015-08-06 05:43:08 -04:00
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