Matt Parlette
efcefd6579
Updated master.d/f_defaults for 2014.7
Added config setting for:
* pillar_source_merging_strategy
9 vuotta sitten
Brian Jackson
15e63e8fd0
Merge pull request #117 from andrew-vant/cloud-templates-redirect
Added pillar option to redirect profile and map folders.
9 vuotta sitten
Andrew Vant
e632b8bcb5
Cloud file.recurse loop no longer hardcodes folder list.
9 vuotta sitten
Andrew Vant
ba143c1810
Updated pillar.example with the correct defaults for template_sources.
9 vuotta sitten
Nitin Madhok
2a35c7227e
Merge pull request #121 from gravyboat/master
Change spaces to dashes in IDs for ssh.sls
9 vuotta sitten
Forrest Alvarez
d3adb685b6
Change spaces to dashes in IDs for ssh.sls
9 vuotta sitten
Forrest
6d12e55d51
Merge pull request #119 from smlloyd/master
Exclude require statement when install_packages is False.
9 vuotta sitten
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 vuotta sitten
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 vuotta sitten
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 vuotta sitten
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 vuotta sitten
Andrew Vant
fb1d7e8d3b
Added pillar option to redirect profile and map folders.
9 vuotta sitten
Nitin Madhok
1f43b96a00
Merge pull request #116 from andrew-vant/mine_functions
Added mine_functions to f_defaults.conf.
9 vuotta sitten
Andrew Vant
2d986eaa3f
Updated pillar.example with mine example.
9 vuotta sitten
Andrew Vant
11efee54c3
Added mine_functions to f_defaults.conf.
9 vuotta sitten
Nitin Madhok
a11c39cf32
Merge pull request #111 from iggy/master
Switch config file.recurse to clean by default and tell it to ignore _*
9 vuotta sitten
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 vuotta sitten
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 vuotta sitten
Nitin Madhok
74d9ce2a01
Merge pull request #112 from aboe76/fix_api_recursion
Fix recursion in api.service
9 vuotta sitten
Niels Abspoel
9ae8a4d746
Fix recursion in api.service
9 vuotta sitten
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.
9 vuotta sitten
Forrest
e6045d873a
Merge pull request #110 from iggy/master
Add modules to install gitfs backend dependencies
9 vuotta sitten
Brian Jackson
4533cc7d0e
Add modules to install gitfs backend dependencies
Add modules for gitfs dependencies and documentation for how to use them.
9 vuotta sitten
Forrest
d8bf7cdbf0
Merge pull request #108 from iggy/master
Add setting to not install packages
9 vuotta sitten
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 vuotta sitten
Nitin Madhok
751613db7c
Merge pull request #107 from iggy/master
Stop using clean: True on /etc/salt/{minion,master}.d
9 vuotta sitten
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.
9 vuotta sitten
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
9 vuotta sitten
Nitin Madhok
2118cc0905
Update LICENSING year
9 vuotta sitten
Forrest
611e78eb4d
Merge pull request #106 from iggy/cleanup_variable_overwriting
Don't overwrite salt variable
9 vuotta sitten
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 vuotta sitten
Nitin Madhok
6a1fc70477
Merge pull request #102 from aboe76/salt-api
Added salt-api support
9 vuotta sitten
Niels Abspoel
5785091305
Added salt-api support
9 vuotta sitten
Nitin Madhok
61a7bc1ddc
Merge pull request #101 from aboe76/fix_opensuse
fix suse os_family
9 vuotta sitten
Niels Abspoel
5d09355c84
fix suse os_family
9 vuotta sitten
Nitin Madhok
ab93f6f1dc
Merge pull request #100 from aboe76/mine_interval_minion
create config option for mine_interval
9 vuotta sitten
Niels Abspoel
90f23948ef
create config option for mine_interval
9 vuotta sitten
Nitin Madhok
cde11bc1e8
Merge pull request #99 from aboe76/mine_get_master
add mine_get function to master config
9 vuotta sitten
Niels Abspoel
b8e53771f3
add mine_get function to master config
9 vuotta sitten
Forrest
ed0f2fab20
Merge pull request #98 from saxonww/master
don't try to load pkgrepo on non-Debian distros
9 vuotta sitten
Will Saxon
ae8e4ca492
don't try to load pkgrepo on non-Debian distros
fixes #83 by wrapping contents of pkgrepo/init.sls in an {% if %}.
Change-Id: I8260fdf5cf802c0b28197516da374add6c3002a2
10 vuotta sitten
Nitin Madhok
1b13259823
Merge pull request #97 from aboe76/multi_master
Fix #39 multi master support to minion
9 vuotta sitten
Niels Abspoel
23fd8b64af
Fix #39 multi master support to minion
This will fix #39
And it will be backwards compatible with the current pillar configuration.
9 vuotta sitten
Nitin Madhok
22fe873c5b
Merge pull request #96 from aboe76/rest_tornado
added rest_tornado to _defaults.conf
9 vuotta sitten
Niels Abspoel
7ddc1692ec
added rest_tornado to _defaults.conf
see pillar.example for configuration
9 vuotta sitten
Nitin Madhok
f39fff2329
Merge pull request #90 from aboe76/master
Updated map.jinja for archlinux package convention
9 vuotta sitten
Niels Abspoel
de71de216e
Merge pull request #94 from jcftang/master
saltify provider should set correct master
9 vuotta sitten
Jimmy Tang
2e30a44e41
saltify provider should set correct master
This is necessary for the correct settings on the minions when saltifying new hosts
9 vuotta sitten
Nitin Madhok
f2131b05f3
Merge pull request #92 from saltstack-formulas/revert-91-master
Revert "Add mine_functions to master config template"
10 vuotta sitten
Nitin Madhok
fa6c39eccd
Revert "Add mine_functions to master config template"
10 vuotta sitten