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
d2df211011
allow state to function without errors if no keys are find in pilar
2016-05-02 09:13:38 -04:00
8ed58c6528
Merge pull request #221 from bradthurber/new-gitfs-functionality
...
add new gitfs functionality
2016-04-28 12:37:53 -07:00
39479cafe9
add missing gitfs parms to minion config file as well (for use by standalone minions)
2016-04-28 09:43:13 -04:00
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
c4ef48c5e8
add new gitfs functionality
2016-04-19 12:51:17 -04:00
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
cca75d93d7
Use the latest stable salt from repo.saltstack.com
2016-04-04 12:28:35 -06:00
d0d4a6cc6b
Merge pull request #218 from UtahDave/master
...
Comment out second master config example
2016-04-04 13:05:02 -05:00
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
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
e26b805279
Added version check for provider/driver backwards compatibility
2016-03-31 23:17:35 -07:00
29d4a55828
Merge pull request #215 from centromere/provider-fix
...
Renamed "provider" to "driver"
2016-03-31 22:48:17 -04:00
c4208bb661
Renamed "provider" to "driver"
2016-03-31 19:39:55 -07:00
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
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
001b034eb5
Replace absolute config pathname prefixes with the config_path variable
2016-03-29 13:28:47 -04:00
ed4fcbc541
Merge pull request #213 from aboe76/spm_formula
...
add formula file this fixes #211
2016-03-27 12:04:29 -07:00
398d71d392
add formula file
2016-03-27 12:39:50 +02:00
59ee0c7761
Merge pull request #212 from genuss/mine_functions
...
Take mine_functions back
2016-03-25 11:43:13 -07:00
e97822a0d5
Take mine_functions back
2016-03-25 16:58:06 +03:00
7856b5ea9a
Merge pull request #210 from iamseth/master
...
Add Windows support to map.jinja
2016-03-22 18:23:35 -07:00
c7552b6d0a
Add Windows support to map.jinja
...
This adds some minimal support for Windows minions.
2016-03-22 20:15:44 -05:00
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
7f36259614
Remove excessive blank lines rendered after "Miscellaneous settings"
2016-03-04 11:50:36 +00:00
c4e116ee8f
Provide Windows repo settings: 2015.8+ master used for pre-2015.8 minions
2016-03-04 11:50:33 +00:00
7474d4239d
Fix Windows repo settings using values from 2015.8 documentation
2016-03-04 11:50:26 +00:00
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
a4c5b4f322
update 2015.8.7 version config for the minion
2016-02-20 23:25:06 +01:00
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
bfcaca38a6
merge options from 2015.8.7 version in f_defaults.conf
2016-02-20 21:07:17 +01:00
8573ba96e2
Merge pull request #202 from irtnog/revert-pr200
...
Revert PR #200
2016-02-16 11:42:57 -08:00
e8021220b8
Revert PR #200
...
This restores the original structure/behavior of the
`salt_formulas` Pillar key.
2016-02-16 10:20:42 -05:00
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
bbeacc4ace
Fixed typo in `pillar.example`
2016-02-08 14:01:47 +00:00
d1cbec3fe2
Added support for downloading formulas from multiple baseurls into the same environment.
2016-02-08 13:45:09 +00:00
337c48b14c
Merge pull request #199 from kevinschmidt/master
...
add consul config support to master config file
2016-01-19 11:31:28 -08:00
ce6849247e
add consul config support
2016-01-19 16:54:05 +00:00
0fee3f58f2
Merge pull request #196 from iamseth/master
...
Replace pkgrepo with offical Saltstack repo
2016-01-17 20:07:50 -08:00
8617db1536
Merge pull request #198 from kevinschmidt/master
...
add support for gitfs whitelist and blacklist
2016-01-13 11:35:56 -08:00
41f2de74bd
* add gitfs whitelist and blacklist
2016-01-13 11:48:27 +00:00
adb0c7008d
removing accidentally committed files
2016-01-09 21:45:23 +01:00
cbe5763668
fix pillar and libvirt
2016-01-09 19:39:47 +01:00
8f2191471b
Replace pkgrepo with offical Saltstack repo
...
issue #180
2016-01-08 11:21:22 -06:00
46346e935f
Merge pull request #195 from vexxhost/master
...
Dropped ppa and updated to official repos for ubuntu
2015-12-24 13:09:36 -08:00
3b8669cd67
dropped ppa and updated to official repos for ubuntu
2015-12-24 13:28:35 -05:00
ad009a68e3
Merge pull request #194 from msciciel/master
...
Add support for returner configuration in salt minion
2015-12-21 11:57:53 -08:00
f1c941a6a8
Merge pull request #1 from msciciel/github
...
Add support for returner configuration in salt minion
2015-12-21 15:17:44 +01:00
02be0b1367
add support for returner setting in minion configuration
2015-12-21 15:00:35 +01:00
422888cf77
Merge branch 'github' into itg
...
Conflicts:
salt/formulas.jinja
2015-12-21 14:55:21 +01:00
Forrest
Brad Thurber
puneet kandhari
David Boucha
Wolodja Wentland
John Galt
Nitin Madhok
Matthew X. Economou
Niels Abspoel
a.genus
Seth Miller
Imran Iqbal
Thomas Larsen
Kevin Schmidt
Mohammed Naser
msciciel
Krzysztof Pawłowski