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 години
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 години
Andrew Vant
f3ed6e1828
cloud.providers.d can now be redirected.
This obsoletes the salt:cloud:folders and salt:cloud:providers pillar
entries. Provider keys have been moved to /etc/salt/pki/cloud.
преди 9 години
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.
преди 9 години
Andrew Vant
fb1d7e8d3b
Added pillar option to redirect profile and map folders.
преди 9 години
Nitin Madhok
1f43b96a00
Merge pull request #116 from andrew-vant/mine_functions
Added mine_functions to f_defaults.conf.
преди 9 години
Andrew Vant
2d986eaa3f
Updated pillar.example with mine example.
преди 9 години
Andrew Vant
11efee54c3
Added mine_functions to f_defaults.conf.
преди 9 години
Nitin Madhok
a11c39cf32
Merge pull request #111 from iggy/master
Switch config file.recurse to clean by default and tell it to ignore _*
преди 9 години
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 ...
преди 9 години
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 .
преди 9 години
Nitin Madhok
74d9ce2a01
Merge pull request #112 from aboe76/fix_api_recursion
Fix recursion in api.service
преди 9 години
Niels Abspoel
9ae8a4d746
Fix recursion in api.service
преди 9 години
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.
преди 10 години
Forrest
e6045d873a
Merge pull request #110 from iggy/master
Add modules to install gitfs backend dependencies
преди 10 години
Brian Jackson
4533cc7d0e
Add modules to install gitfs backend dependencies
Add modules for gitfs dependencies and documentation for how to use them.
преди 10 години
Forrest
d8bf7cdbf0
Merge pull request #108 from iggy/master
Add setting to not install packages
преди 10 години
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.
преди 10 години
Nitin Madhok
751613db7c
Merge pull request #107 from iggy/master
Stop using clean: True on /etc/salt/{minion,master}.d
преди 10 години
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.
преди 10 години
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
преди 10 години
Nitin Madhok
2118cc0905
Update LICENSING year
преди 10 години
Forrest
611e78eb4d
Merge pull request #106 from iggy/cleanup_variable_overwriting
Don't overwrite salt variable
преди 10 години
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.
преди 10 години
Nitin Madhok
6a1fc70477
Merge pull request #102 from aboe76/salt-api
Added salt-api support
преди 10 години
Niels Abspoel
5785091305
Added salt-api support
преди 10 години
Nitin Madhok
61a7bc1ddc
Merge pull request #101 from aboe76/fix_opensuse
fix suse os_family
преди 10 години