saltstack-formulas/salt-formula
Template
2
0
Fork 0
Code Releases Activity
924 Commits 3 Branches 68 Tags 2 MiB
752a1dea22
Commit Graph

924 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
René Jochum
c5ae289fa1 Fix stuff suggested by @iggy. 
Signed-off-by: René Jochum <rene@jochums.at>
 2015-07-13 22:31:32 +02:00
puneet kandhari
ac7266a515 Merge pull request #151 from pcdummy/master 
Install cherrypy/tornado from pip only if use_pip is True for salt-api.
 2015-07-13 13:13:16 -07:00
René Jochum
90282eff03 Install cherrypy/tornado from pip only if use_pip is True. 
Signed-off-by: René Jochum <rene@jochums.at>
 2015-07-13 22:08:20 +02:00
puneet kandhari
b90fdc6f6a Merge pull request #150 from pcdummy/master 
Advance salt/api.sls, install rest_cherrypy or rest_tornado from pip.
 2015-07-13 07:22:04 -05:00
René Jochum
8a1b8dc9db Fix salt/api.sls. 
Signed-off-by: René Jochum <rene@jochums.at>
 2015-07-13 13:46:17 +02:00
René Jochum
7bb82b0178 Advance sal/api.sls, install rest_cherrypy or rest_tornado from pip. 
Signed-off-by: René Jochum <rene@jochums.at>
 2015-07-13 13:37:10 +02:00
Brian Jackson
779e6c9c63 Merge pull request #122 from matthew-parlette/master 
Updated master.d/f_defaults for 2014.7
 2015-07-07 12:43:01 -05:00
puneet kandhari
c21c204dd5 Merge pull request #147 from quixoten/fix_syntax_error 
Fix syntax error
 2015-06-19 16:42:56 -05:00
Devin Christensen
645b4c65ce Fix syntax error 2015-06-19 15:33:16 -06:00
puneet kandhari
8fcb42819b Merge pull request #146 from quixoten/fix_syndic 
Fix syndic requisites
 2015-06-17 11:28:28 -05:00
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.
 2015-06-17 09:53:31 -06:00
Nitin Madhok
c358d4d1d3 Merge pull request #145 from peterdemin/master 
formulas.jinja: python 2.6 support
 2015-06-17 10:58:07 -04:00
Petr Demin
eb421c676f formulas.jinja: python 2.6 support 2015-06-17 17:51:40 +03:00
puneet kandhari
4eb6d87870 Merge pull request #144 from peterdemin/master 
formulas.jinja: python 2.6 support
 2015-06-17 09:24:31 -05:00
Petr Demin
d4180295e3 formulas.jinja: python 2.6 support 2015-06-17 17:12:28 +03:00
puneet kandhari
975dd08885 Merge pull request #143 from aboe76/slspath_variable 
Remove hardcoded paths with {{ slspath }} variable
 2015-06-09 16:20:47 -05:00
Niels Abspoel
6ec31374cb Remove hardcoded paths with {{ slspath }} variable 2015-06-09 23:05:49 +02:00
Brian Jackson
62a13de7d5 Merge pull request #141 from willshersystems/develop 
The git command line tool is a requirement of pygit2
 2015-06-05 16:37:30 -05:00
Matt Willsher
1cf72d85f8 The git command line tool is a requirement of pygit2 2015-06-05 21:27:01 +01:00
puneet kandhari
8d8371f19d Merge pull request #139 from willshersystems/centos 
Improved support for Enterprise Linux family OSs (CentOS, RHEL etc)
 2015-06-04 09:46:33 -07:00
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
 2015-06-04 17:35:40 +01:00
Forrest
bffb87c29f Merge pull request #137 from puneetk/master 
Remove Duplicates from defaults.yaml and map.jinja
 2015-05-26 13:58:50 -07:00
puneet kandhari
145b58a9d3 Remove Duplicates from defaults.yaml and map.jinja 2015-05-26 13:28:17 -05:00
Nitin Madhok
d16abf86b6 Merge pull request #135 from aboe76/fix_empty_formula_pillar 
fix empty formulas list in pillar with empty dic.
 2015-05-17 15:14:17 -04:00
Niels Abspoel
14c262fdad fix empty formulas list in pillar with empty dic. 2015-05-17 15:39:49 +02:00
Niels Abspoel
efd15e0896 Merge pull request #134 from edvinasme/pillar-roots-format 
Fix pillar_roots configuration format in master
 2015-05-16 15:04:39 +02:00
Edvinas Klovas
8992e15882 fix typo 2015-05-16 15:51:19 +03:00
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.
 2015-05-16 15:15:56 +03:00
Brian Jackson
b3db6e2a76 Merge pull request #133 from edvinasme/pillar-update 
add pillar_roots for minion and master in pillar.example
 2015-05-14 10:37:04 -05:00
Edvinas Klovas
47b75d05c7 add pillar_roots for minion and master in pillar.example 2015-05-14 13:37:36 +03:00
Wolodja Wentland
46f44c1dbe Merge pull request #132 from txomon/patch-2 
Cleanup template for easier user reading
 2015-05-09 13:18:04 +02:00
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
 2015-05-08 22:33:43 +02:00
Brian Jackson
54a5c85771 Merge pull request #129 from julienlavergne/setup 
fixed missing add-apt-repository command when ubuntu is the server one
 2015-04-23 11:26:21 -05:00
Julien Lavergne
09073ebed8 optimized setup bootstrap 2015-04-23 11:08:39 +02:00
Julien Lavergne
e87132cf1c fixed missing add-apt-repository command when ubuntu is the server one 2015-04-23 10:11:36 +02:00
Brian Jackson
31a117e58a Merge pull request #125 from julienlavergne/setup 
fixed wrong command name: add-apt-repository became apt-add-repository
 2015-04-22 10:27:36 -05:00
Julien Lavergne
df05eb70d8 fixed wrong command name: add-apt-repository became apt-add-repository 2015-04-22 16:59:18 +02:00
Forrest
b36800f07e Merge pull request #123 from andrew-vant/providers-oops 
ec2/gce profiles/providers are no longer configured if they are not used
 2015-04-17 10:27:28 -07:00
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.
 2015-04-17 10:48:47 -04:00
Matt Parlette
efcefd6579 Updated master.d/f_defaults for 2014.7 
Added config setting for:

* pillar_source_merging_strategy
 2015-04-15 15:36:09 -04:00
Brian Jackson
15e63e8fd0 Merge pull request #117 from andrew-vant/cloud-templates-redirect 
Added pillar option to redirect profile and map folders.
 2015-04-14 11:34:12 -05:00
Andrew Vant
e632b8bcb5 Cloud file.recurse loop no longer hardcodes folder list. 2015-04-13 16:08:11 -04:00
Andrew Vant
ba143c1810 Updated pillar.example with the correct defaults for template_sources. 2015-04-13 16:07:03 -04:00
Nitin Madhok
2a35c7227e Merge pull request #121 from gravyboat/master 
Change spaces to dashes in IDs for ssh.sls
 2015-04-10 19:16:58 -04:00
Forrest Alvarez
d3adb685b6 Change spaces to dashes in IDs for ssh.sls 2015-04-10 16:11:19 -07:00
Forrest
6d12e55d51 Merge pull request #119 from smlloyd/master 
Exclude require statement when install_packages is False.
 2015-04-09 10:18:08 -07:00
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.
 2015-04-09 17:16:15 +02:00
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.
 2015-04-06 11:24:41 -04:00
Andrew Vant
f3ed6e1828 cloud.providers.d can now be redirected. 
This obsoletes the salt☁️folders and salt☁️providers pillar
entries. Provider keys have been moved to /etc/salt/pki/cloud.
 2015-04-03 19:30:26 -04:00
Andrew Vant
7e074dc379 Supplied default values for all pillar queries in provider templates. 
These aren't intended to function; they're here to allow the use of
file.recurse on the provider folder, without requiring the user
to provide pillar data for templates they're not using.
 2015-04-03 18:47:08 -04:00