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 лет назад
puneet kandhari
96d820a5a0
Merge pull request #152 from pcdummy/master
Fix stuff suggested by @iggy .
9 лет назад
René Jochum
c5ae289fa1
Fix stuff suggested by @iggy .
Signed-off-by: René Jochum <rene@jochums.at>
9 лет назад
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 лет назад
René Jochum
90282eff03
Install cherrypy/tornado from pip only if use_pip is True.
Signed-off-by: René Jochum <rene@jochums.at>
9 лет назад
puneet kandhari
b90fdc6f6a
Merge pull request #150 from pcdummy/master
Advance salt/api.sls, install rest_cherrypy or rest_tornado from pip.
9 лет назад
René Jochum
8a1b8dc9db
Fix salt/api.sls.
Signed-off-by: René Jochum <rene@jochums.at>
9 лет назад
René Jochum
7bb82b0178
Advance sal/api.sls, install rest_cherrypy or rest_tornado from pip.
Signed-off-by: René Jochum <rene@jochums.at>
9 лет назад
Brian Jackson
779e6c9c63
Merge pull request #122 from matthew-parlette/master
Updated master.d/f_defaults for 2014.7
9 лет назад
puneet kandhari
c21c204dd5
Merge pull request #147 from quixoten/fix_syntax_error
Fix syntax error
9 лет назад
Devin Christensen
645b4c65ce
Fix syntax error
9 лет назад
puneet kandhari
8fcb42819b
Merge pull request #146 from quixoten/fix_syndic
Fix syndic requisites
9 лет назад
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 лет назад
Nitin Madhok
c358d4d1d3
Merge pull request #145 from peterdemin/master
formulas.jinja: python 2.6 support
9 лет назад
Petr Demin
eb421c676f
formulas.jinja: python 2.6 support
9 лет назад
puneet kandhari
4eb6d87870
Merge pull request #144 from peterdemin/master
formulas.jinja: python 2.6 support
9 лет назад
Petr Demin
d4180295e3
formulas.jinja: python 2.6 support
9 лет назад
puneet kandhari
975dd08885
Merge pull request #143 from aboe76/slspath_variable
Remove hardcoded paths with {{ slspath }} variable
9 лет назад
Niels Abspoel
6ec31374cb
Remove hardcoded paths with {{ slspath }} variable
9 лет назад
Brian Jackson
62a13de7d5
Merge pull request #141 from willshersystems/develop
The git command line tool is a requirement of pygit2
9 лет назад
Matt Willsher
1cf72d85f8
The git command line tool is a requirement of pygit2
9 лет назад
puneet kandhari
8d8371f19d
Merge pull request #139 from willshersystems/centos
Improved support for Enterprise Linux family OSs (CentOS, RHEL etc)
9 лет назад
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 лет назад
Forrest
bffb87c29f
Merge pull request #137 from puneetk/master
Remove Duplicates from defaults.yaml and map.jinja
9 лет назад
puneet kandhari
145b58a9d3
Remove Duplicates from defaults.yaml and map.jinja
9 лет назад
Nitin Madhok
d16abf86b6
Merge pull request #135 from aboe76/fix_empty_formula_pillar
fix empty formulas list in pillar with empty dic.
9 лет назад
Niels Abspoel
14c262fdad
fix empty formulas list in pillar with empty dic.
9 лет назад
Niels Abspoel
efd15e0896
Merge pull request #134 from edvinasme/pillar-roots-format
Fix pillar_roots configuration format in master
9 лет назад
Edvinas Klovas
8992e15882
fix typo
9 лет назад
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 лет назад
Brian Jackson
b3db6e2a76
Merge pull request #133 from edvinasme/pillar-update
add pillar_roots for minion and master in pillar.example
9 лет назад
Edvinas Klovas
47b75d05c7
add pillar_roots for minion and master in pillar.example
9 лет назад
Wolodja Wentland
46f44c1dbe
Merge pull request #132 from txomon/patch-2
Cleanup template for easier user reading
9 лет назад
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 лет назад
Brian Jackson
54a5c85771
Merge pull request #129 from julienlavergne/setup
fixed missing add-apt-repository command when ubuntu is the server one
9 лет назад
Julien Lavergne
09073ebed8
optimized setup bootstrap
9 лет назад
Julien Lavergne
e87132cf1c
fixed missing add-apt-repository command when ubuntu is the server one
9 лет назад
Brian Jackson
31a117e58a
Merge pull request #125 from julienlavergne/setup
fixed wrong command name: add-apt-repository became apt-add-repository
9 лет назад
Julien Lavergne
df05eb70d8
fixed wrong command name: add-apt-repository became apt-add-repository
9 лет назад
Forrest
b36800f07e
Merge pull request #123 from andrew-vant/providers-oops
ec2/gce profiles/providers are no longer configured if they are not used
9 лет назад
Andrew Vant
a01249a7fc
ec2/gce profiles/providers are no longer configured if they are not used.
Needed because salt-cloud will attempt to load them even if they are
filled with invalid default values, creating error spam.
9 лет назад
Matt Parlette
efcefd6579
Updated master.d/f_defaults for 2014.7
Added config setting for:
* pillar_source_merging_strategy
9 лет назад
Brian Jackson
15e63e8fd0
Merge pull request #117 from andrew-vant/cloud-templates-redirect
Added pillar option to redirect profile and map folders.
9 лет назад
Andrew Vant
e632b8bcb5
Cloud file.recurse loop no longer hardcodes folder list.
9 лет назад
Andrew Vant
ba143c1810
Updated pillar.example with the correct defaults for template_sources.
9 лет назад
Nitin Madhok
2a35c7227e
Merge pull request #121 from gravyboat/master
Change spaces to dashes in IDs for ssh.sls
9 лет назад
Forrest Alvarez
d3adb685b6
Change spaces to dashes in IDs for ssh.sls
9 лет назад
Forrest
6d12e55d51
Merge pull request #119 from smlloyd/master
Exclude require statement when install_packages is False.
9 лет назад
Simon Lloyd
462455ead9
Exclude require statement when install_packages is False.
The 'require' statement needs a list as input, but doesn't get
any input when install_packages is set to False.
9 лет назад
Andrew Vant
f0e9c2df87
Enforced root-only permissions on cloud.providers.d.
As mentioned in issue #118, provider files may contain passwords
or API keys and should be restricted. Profiles/maps are probably
OK with the defaults.
9 лет назад