Brian Jackson
bc0776e4e3
Merge pull request #157 from irtnog/fix-freebsd-saltssh-package
Use the py27-salt package when installing salt-ssh on FreeBSD
9 years ago
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.).
9 years ago
puneet kandhari
e5ad08ee1e
Merge pull request #156 from iggy/revert_bad
Revert bad
9 years ago
Brian Jackson
4c1f57792a
Revert "Advance sal/api.sls, install rest_cherrypy or rest_tornado from pip."
This reverts commit 7bb82b0178
.
9 years ago
Brian Jackson
6e98d508c4
Revert "Fix salt/api.sls."
This reverts commit 8a1b8dc9db
.
9 years ago
Brian Jackson
d216a3f651
Revert "Install cherrypy/tornado from pip only if use_pip is True."
This reverts commit 90282eff03
.
9 years ago
Brian Jackson
8448aa4021
Revert "Fix stuff suggested by @iggy."
This reverts commit c5ae289fa1
.
9 years ago
Brian Jackson
ed3ab22a13
Revert "Add support for GitPython and salt-ssh on FreeBSD masters"
This reverts commit b03831c0b0
.
9 years ago
Brian Jackson
f9cb912a65
Revert "salt.api state fails"
This reverts commit 22b8dde1ff
.
9 years ago
Brian Jackson
ef73e4ce98
Revert "Change variable lookup to match usage in other states"
This reverts commit 14b466e022
.
9 years ago
puneet kandhari
b04fc8c843
Merge pull request #154 from irtnog/add-freebsd-support-saltssh-gitpython
Add support for GitPython and salt-ssh on FreeBSD masters
9 years ago
Matthew X. Economou
14b466e022
Change variable lookup to match usage in other states
Done at the maintainer's request.
9 years ago
puneet kandhari
af8c157e2b
Merge pull request #155 from Oro/patch-1
salt.api state fails
9 years ago
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
9 years ago
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`.
9 years ago
puneet kandhari
96d820a5a0
Merge pull request #152 from pcdummy/master
Fix stuff suggested by @iggy .
9 years ago
René Jochum
c5ae289fa1
Fix stuff suggested by @iggy .
Signed-off-by: René Jochum <rene@jochums.at>
9 years ago
puneet kandhari
ac7266a515
Merge pull request #151 from pcdummy/master
Install cherrypy/tornado from pip only if use_pip is True for salt-api.
9 years ago
René Jochum
90282eff03
Install cherrypy/tornado from pip only if use_pip is True.
Signed-off-by: René Jochum <rene@jochums.at>
9 years ago
puneet kandhari
b90fdc6f6a
Merge pull request #150 from pcdummy/master
Advance salt/api.sls, install rest_cherrypy or rest_tornado from pip.
9 years ago
René Jochum
8a1b8dc9db
Fix salt/api.sls.
Signed-off-by: René Jochum <rene@jochums.at>
9 years ago
René Jochum
7bb82b0178
Advance sal/api.sls, install rest_cherrypy or rest_tornado from pip.
Signed-off-by: René Jochum <rene@jochums.at>
9 years ago
Brian Jackson
779e6c9c63
Merge pull request #122 from matthew-parlette/master
Updated master.d/f_defaults for 2014.7
9 years ago
puneet kandhari
c21c204dd5
Merge pull request #147 from quixoten/fix_syntax_error
Fix syntax error
9 years ago
Devin Christensen
645b4c65ce
Fix syntax error
9 years ago
puneet kandhari
8fcb42819b
Merge pull request #146 from quixoten/fix_syndic
Fix syndic requisites
9 years ago
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.
9 years ago
Nitin Madhok
c358d4d1d3
Merge pull request #145 from peterdemin/master
formulas.jinja: python 2.6 support
9 years ago
Petr Demin
eb421c676f
formulas.jinja: python 2.6 support
9 years ago
puneet kandhari
4eb6d87870
Merge pull request #144 from peterdemin/master
formulas.jinja: python 2.6 support
9 years ago
Petr Demin
d4180295e3
formulas.jinja: python 2.6 support
9 years ago
puneet kandhari
975dd08885
Merge pull request #143 from aboe76/slspath_variable
Remove hardcoded paths with {{ slspath }} variable
9 years ago
Niels Abspoel
6ec31374cb
Remove hardcoded paths with {{ slspath }} variable
9 years ago
Brian Jackson
62a13de7d5
Merge pull request #141 from willshersystems/develop
The git command line tool is a requirement of pygit2
9 years ago
Matt Willsher
1cf72d85f8
The git command line tool is a requirement of pygit2
9 years ago
puneet kandhari
8d8371f19d
Merge pull request #139 from willshersystems/centos
Improved support for Enterprise Linux family OSs (CentOS, RHEL etc)
9 years ago
Matt Willsher
e2d192ba89
Improvements to Enterprise Linux family OSs.
* Install pygit from package
* Add Official Salt ZeroMQ 4 COPR repository
Note that Salt itself is assumed to already to be available to the system via yum, via EPEL for example
9 years ago
Forrest
bffb87c29f
Merge pull request #137 from puneetk/master
Remove Duplicates from defaults.yaml and map.jinja
9 years ago
puneet kandhari
145b58a9d3
Remove Duplicates from defaults.yaml and map.jinja
9 years ago
Nitin Madhok
d16abf86b6
Merge pull request #135 from aboe76/fix_empty_formula_pillar
fix empty formulas list in pillar with empty dic.
9 years ago
Niels Abspoel
14c262fdad
fix empty formulas list in pillar with empty dic.
9 years ago
Niels Abspoel
efd15e0896
Merge pull request #134 from edvinasme/pillar-roots-format
Fix pillar_roots configuration format in master
9 years ago
Edvinas Klovas
8992e15882
fix typo
9 years ago
Edvinas Klovas
47b37f2ffb
Fix pillar_roots configuration format in master
This commit fixes how `pillar_roots` are generated and after this fix the
generated configuration does not contain any unnecessary new lines:
```yaml
pillar_roots:
base:
/srv/salt/dir1
dev:
/srv/salt/dir2
/srv/salt/dir3
locale:
/srv/salt/dir4
```
Before this commit the pillar_roots in `f_defaults.conf` for master would be
generated with a lot of empty lines in between directories, like this:
```yaml
pillar_roots:
base:
/srv/salt/dir1
dev:
/srv/salt/dir2
/srv/salt/dir3
local:
/srv/salt/dir4
```
The minion configuration is not affected and renders fine.
9 years ago
Brian Jackson
b3db6e2a76
Merge pull request #133 from edvinasme/pillar-update
add pillar_roots for minion and master in pillar.example
9 years ago
Edvinas Klovas
47b75d05c7
add pillar_roots for minion and master in pillar.example
9 years ago
Wolodja Wentland
46f44c1dbe
Merge pull request #132 from txomon/patch-2
Cleanup template for easier user reading
9 years ago
Javier Domingo
4344a1311b
Cleanup template for easier user reading
The user will already have it's /etc/salt/minion file, so it doesn't need all this info, and it makes easier to know what has been generated and what not
9 years ago
Brian Jackson
54a5c85771
Merge pull request #129 from julienlavergne/setup
fixed missing add-apt-repository command when ubuntu is the server one
9 years ago
Julien Lavergne
09073ebed8
optimized setup bootstrap
9 years ago