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

899 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Andrew Vant
fb1d7e8d3b Added pillar option to redirect profile and map folders. 2015-04-03 17:33:25 -04:00
Nitin Madhok
1f43b96a00 Merge pull request #116 from andrew-vant/mine_functions 
Added mine_functions to f_defaults.conf.
 2015-04-03 15:52:02 -04:00
Andrew Vant
2d986eaa3f Updated pillar.example with mine example. 2015-04-03 15:35:14 -04:00
Andrew Vant
11efee54c3 Added mine_functions to f_defaults.conf. 2015-04-03 14:34:34 -04:00
Nitin Madhok
a11c39cf32 Merge pull request #111 from iggy/master 
Switch config file.recurse to clean by default and tell it to ignore _*
 2015-04-01 05:08:01 -04:00
Forrest
2247630ac8 Merge pull request #114 from irtnog/revert-salt_cloud_certs-pillar-lookup 
[bugfix] Reverts lookup of salt_cloud_certs to original pillar key, in line with ...
 2015-03-30 19:19:57 -07:00
Matthew X. Economou
943d7f2dc1 Reverts lookup of salt_cloud_certs to original pillar key, in line with existing documentation and the certificate template file. 
Please refer to issue https://github.com/saltstack-formulas/salt-formula/issues/113.
 2015-03-30 13:54:50 -04:00
Nitin Madhok
74d9ce2a01 Merge pull request #112 from aboe76/fix_api_recursion 
Fix recursion in api.service
 2015-03-29 19:11:39 -04:00
Niels Abspoel
9ae8a4d746 Fix recursion in api.service 2015-03-28 22:29:01 +01:00
Brian Jackson
7649c26a0d Switch config file.recurse to clean by default and tell it to ignore _* 
Salt writes it's schedule file to /etc/salt/{minion,master}.d/_schedule.conf

We don't want to stomp all over Salt's files, but we do want a pristine
starting point to lay down our managed config. So we use clean: True on the
file.recurse call, but we tell it to ignore files that start with an _

We have to rename the current config file (_defaults.conf) because it will be
ignored by the rule that ignores Salt's _* config files.

This also means we need to clean up old config files (_defaults.conf) and
restart the service if we cleaned it up.
 2015-03-27 17:58:05 -05:00
Forrest
e6045d873a Merge pull request #110 from iggy/master 
Add modules to install gitfs backend dependencies
 2015-03-25 19:57:51 -07:00
Brian Jackson
4533cc7d0e Add modules to install gitfs backend dependencies 
Add modules for gitfs dependencies and documentation for how to use them.
 2015-03-25 21:52:29 -05:00
Forrest
d8bf7cdbf0 Merge pull request #108 from iggy/master 
Add setting to not install packages
 2015-03-25 19:20:42 -07:00
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.
 2015-03-24 12:08:08 -05:00
Nitin Madhok
751613db7c Merge pull request #107 from iggy/master 
Stop using clean: True on /etc/salt/{minion,master}.d
 2015-03-24 12:57:11 -04:00
Brian Jackson
86c7b0a3e5 Add note about config option 
Add note explaining what clean_config_d_dir does and why you shouldn't set it
to True.
 2015-03-24 11:01:58 -05:00
Brian Jackson
8ebb7f57df Stop using clean: True on /etc/salt/{minion,master}.d 
New versions of Salt put config files in /etc/salt/{minion,master}.d. We don't
want to erase them by using a clean: True on the file.recurse. This is a
backward incompatible change, but it's necessary to avoid deleting Salt config
files.

Resolves #104
 2015-03-24 10:46:25 -05:00
Nitin Madhok
2118cc0905 Update LICENSING year 2015-03-20 20:05:04 -04:00
Forrest
611e78eb4d Merge pull request #106 from iggy/cleanup_variable_overwriting 
Don't overwrite salt variable
 2015-03-17 15:27:00 -07:00
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.
 2015-03-16 23:39:32 -05:00
Nitin Madhok
6a1fc70477 Merge pull request #102 from aboe76/salt-api 
Added salt-api support
 2015-03-07 16:02:33 -07:00
Niels Abspoel
5785091305 Added salt-api support 2015-03-08 00:01:28 +01:00
Nitin Madhok
61a7bc1ddc Merge pull request #101 from aboe76/fix_opensuse 
fix suse os_family
 2015-03-07 05:49:35 -07:00
Niels Abspoel
5d09355c84 fix suse os_family 2015-03-07 11:24:50 +01:00
Nitin Madhok
ab93f6f1dc Merge pull request #100 from aboe76/mine_interval_minion 
create config option for mine_interval
 2015-02-21 01:18:14 +05:30