Simon Lloyd
02f7b279a1
Only watch salt-api package if install_packages=true
Also watch salt-api pkg instead of salt-master one.
9 år sedan
Brian Jackson
4c1f57792a
Revert "Advance sal/api.sls, install rest_cherrypy or rest_tornado from pip."
This reverts commit 7bb82b0178
.
9 år sedan
Brian Jackson
6e98d508c4
Revert "Fix salt/api.sls."
This reverts commit 8a1b8dc9db
.
9 år sedan
Brian Jackson
d216a3f651
Revert "Install cherrypy/tornado from pip only if use_pip is True."
This reverts commit 90282eff03
.
9 år sedan
Brian Jackson
8448aa4021
Revert "Fix stuff suggested by @iggy."
This reverts commit c5ae289fa1
.
9 år sedan
Brian Jackson
f9cb912a65
Revert "salt.api state fails"
This reverts commit 22b8dde1ff
.
9 år sedan
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 år sedan
René Jochum
c5ae289fa1
Fix stuff suggested by @iggy .
Signed-off-by: René Jochum <rene@jochums.at>
9 år sedan
René Jochum
90282eff03
Install cherrypy/tornado from pip only if use_pip is True.
Signed-off-by: René Jochum <rene@jochums.at>
9 år sedan
René Jochum
8a1b8dc9db
Fix salt/api.sls.
Signed-off-by: René Jochum <rene@jochums.at>
9 år sedan
René Jochum
7bb82b0178
Advance sal/api.sls, install rest_cherrypy or rest_tornado from pip.
Signed-off-by: René Jochum <rene@jochums.at>
9 år sedan
Niels Abspoel
9ae8a4d746
Fix recursion in api.service
9 år sedan
Brian Jackson
924c04c0d8
Add setting to not install packages
If you are installing Salt via git/pip, the formula will try to overwrite your
install with packaged versions. This setting makes it possible to avoid that.
9 år sedan
Brian Jackson
cb3aa80c62
Don't overwrite salt variable
Using a variable named salt is a bad idea when salt already has a variable
named salt.
9 år sedan
Niels Abspoel
5785091305
Added salt-api support
9 år sedan