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

791 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Forrest
d3476bae04 Merge pull request #230 from bersace/json-render 
Render config as JSON
 2016-05-29 22:43:29 -07:00
Étienne BERSAC
adad72741e Render config as JSON 2016-05-29 20:43:45 +02:00
Forrest
7f41dff871 Merge pull request #229 from mchugh19/master 
Support engine configuration
 2016-05-27 21:40:39 -07:00
Christian McHugh
ac4ed62c03 Support engine configuration 2016-05-27 23:27:55 -05:00
Forrest
76de5f9285 Merge pull request #227 from bradthurber/master-auth-ldap-support 
Add support for master eauth LDAP config
 2016-05-26 12:19:37 -07:00
Brad Thurber
b9ae603fd7 Add support for master eauth LDAP config 2016-05-26 10:52:10 -04:00
Forrest
4388d06963 Merge pull request #225 from bradthurber/non-templated-cloud-config 
Ability to create non-templated cloud maps/providers/profiles
 2016-05-06 11:56:31 -07:00
Brad Thurber
b3a3fa4d72 Ability to create non-templated cloud config files (maps/providers/profiles). 2016-05-06 14:45:41 -04:00
Forrest
0a601fc310 Merge pull request #224 from bradthurber/allow-empty-gitfs-keys 
allow gitfs.keys state to function without error when no keys
 2016-05-02 10:26:00 -07:00
Brad Thurber
d2df211011 allow state to function without errors if no keys are find in pilar 2016-05-02 09:13:38 -04:00
Forrest
8ed58c6528 Merge pull request #221 from bradthurber/new-gitfs-functionality 
add new gitfs functionality
 2016-04-28 12:37:53 -07:00
Brad Thurber
39479cafe9 add missing gitfs parms to minion config file as well (for use by standalone minions) 2016-04-28 09:43:13 -04:00
Brad Thurber
939aa37028 Cleanup and make closer to the PR submitted for the mainline salt repo master config file 2016-04-20 15:10:55 -04:00
Brad Thurber
c4ef48c5e8 add new gitfs functionality 2016-04-19 12:51:17 -04:00
puneet kandhari
6578fb2ae2 Merge pull request #219 from UtahDave/master 
Use the latest stable salt from repo.saltstack.com
 2016-04-04 13:31:54 -05:00
David Boucha
cca75d93d7 Use the latest stable salt from repo.saltstack.com 2016-04-04 12:28:35 -06:00
puneet kandhari
d0d4a6cc6b Merge pull request #218 from UtahDave/master 
Comment out second master config example
 2016-04-04 13:05:02 -05:00
David Boucha
08501c9e18 Comment out second master config example 
This second master config example was causing problems when vagrant
would use the default pillar.example
 2016-04-04 11:48:20 -06:00
Wolodja Wentland
633ce3630f Merge pull request #216 from centromere/driver-version-check 
Added version check for provider/driver backwards compatibility
 2016-04-01 08:22:01 +02:00
John Galt
e26b805279 Added version check for provider/driver backwards compatibility 2016-03-31 23:17:35 -07:00
Nitin Madhok
29d4a55828 Merge pull request #215 from centromere/provider-fix 
Renamed "provider" to "driver"
 2016-03-31 22:48:17 -04:00
John Galt
c4208bb661 Renamed "provider" to "driver" 2016-03-31 19:39:55 -07:00
Forrest
4acd1711a2 Merge pull request #214 from irtnog/fix-paths-freebsd 
Prefix configuration files with the suitable O/S-specific pathname
 2016-03-29 11:23:08 -07:00
Matthew X. Economou
abe9b91e66 Replace reference to slspath with the complete URL of the source file 
Without this change, importing map.jinja in config files (as opposed to
SLS files) causes a rendering error because `slspath` isn't defined.
The `salt_settings.key_url` variable gets used only in
`salt/pkgrepo/debian/init.sls`.
 2016-03-29 13:36:46 -04:00
Matthew X. Economou
001b034eb5 Replace absolute config pathname prefixes with the config_path variable 2016-03-29 13:28:47 -04:00
Forrest
ed4fcbc541 Merge pull request #213 from aboe76/spm_formula 
add formula file this fixes #211
 2016-03-27 12:04:29 -07:00
Niels Abspoel
398d71d392 add formula file 2016-03-27 12:39:50 +02:00
Forrest
59ee0c7761 Merge pull request #212 from genuss/mine_functions 
Take mine_functions back
 2016-03-25 11:43:13 -07:00
a.genus
e97822a0d5 Take mine_functions back 2016-03-25 16:58:06 +03:00
Forrest
7856b5ea9a Merge pull request #210 from iamseth/master 
Add Windows support to map.jinja
 2016-03-22 18:23:35 -07:00
Seth Miller
c7552b6d0a Add Windows support to map.jinja 
This adds some minimal support for Windows minions.
 2016-03-22 20:15:44 -05:00
Forrest
7abdf217a9 Merge pull request #205 from myii/PR_FixWindowsRepoSettings 
Fix Windows repo settings using values from 2015.8 documentation
 2016-03-04 11:34:05 -08:00
Imran Iqbal
7f36259614 Remove excessive blank lines rendered after "Miscellaneous settings" 2016-03-04 11:50:36 +00:00
Imran Iqbal
c4e116ee8f Provide Windows repo settings: 2015.8+ master used for pre-2015.8 minions 2016-03-04 11:50:33 +00:00
Imran Iqbal
7474d4239d Fix Windows repo settings using values from 2015.8 documentation 2016-03-04 11:50:26 +00:00
Nitin Madhok
043433b90a Merge pull request #204 from aboe76/master 
update 2015.8.7 version config for the minion
 2016-02-20 18:11:57 -05:00
Niels Abspoel
a4c5b4f322 update 2015.8.7 version config for the minion 2016-02-20 23:25:06 +01:00
Forrest
a8ced2e98f Merge pull request #203 from aboe76/master_config_2015.8.7 
merge options from 2015.8.7 version in f_defaults.conf
 2016-02-20 13:26:15 -08:00
Niels Abspoel
bfcaca38a6 merge options from 2015.8.7 version in f_defaults.conf 2016-02-20 21:07:17 +01:00
Forrest
8573ba96e2 Merge pull request #202 from irtnog/revert-pr200 
Revert PR #200
 2016-02-16 11:42:57 -08:00
Matthew X. Economou
e8021220b8 Revert PR #200 
This restores the original structure/behavior of the
`salt_formulas` Pillar key.
 2016-02-16 10:20:42 -05:00
Forrest
b47fec3564 Merge pull request #200 from thomaslarsen/master 
Support for downloading formulas from multiple baseurls into same environment
 2016-02-08 11:06:29 -08:00
Thomas Larsen
bbeacc4ace Fixed typo in pillar.example 2016-02-08 14:01:47 +00:00
Thomas Larsen
d1cbec3fe2 Added support for downloading formulas from multiple baseurls into the same environment. 2016-02-08 13:45:09 +00:00
Forrest
337c48b14c Merge pull request #199 from kevinschmidt/master 
add consul config support to master config file
 2016-01-19 11:31:28 -08:00
Kevin Schmidt
ce6849247e add consul config support 2016-01-19 16:54:05 +00:00
Forrest
0fee3f58f2 Merge pull request #196 from iamseth/master 
Replace pkgrepo with offical Saltstack repo
 2016-01-17 20:07:50 -08:00
Forrest
8617db1536 Merge pull request #198 from kevinschmidt/master 
add support for gitfs whitelist and blacklist
 2016-01-13 11:35:56 -08:00
Kevin Schmidt
41f2de74bd * add gitfs whitelist and blacklist 2016-01-13 11:48:27 +00:00
Niels Abspoel
adb0c7008d removing accidentally committed files 2016-01-09 21:45:23 +01:00