Forrest
7f41dff871
Merge pull request #229 from mchugh19/master
Support engine configuration
8 år sedan
Christian McHugh
ac4ed62c03
Support engine configuration
8 år sedan
Forrest
76de5f9285
Merge pull request #227 from bradthurber/master-auth-ldap-support
Add support for master eauth LDAP config
8 år sedan
Brad Thurber
b9ae603fd7
Add support for master eauth LDAP config
8 år sedan
Forrest
4388d06963
Merge pull request #225 from bradthurber/non-templated-cloud-config
Ability to create non-templated cloud maps/providers/profiles
8 år sedan
Brad Thurber
b3a3fa4d72
Ability to create non-templated cloud config files (maps/providers/profiles).
8 år sedan
Forrest
0a601fc310
Merge pull request #224 from bradthurber/allow-empty-gitfs-keys
allow gitfs.keys state to function without error when no keys
8 år sedan
Brad Thurber
d2df211011
allow state to function without errors if no keys are find in pilar
8 år sedan
Forrest
8ed58c6528
Merge pull request #221 from bradthurber/new-gitfs-functionality
add new gitfs functionality
8 år sedan
Brad Thurber
39479cafe9
add missing gitfs parms to minion config file as well (for use by standalone minions)
8 år sedan
Brad Thurber
939aa37028
Cleanup and make closer to the PR submitted for the mainline salt repo master config file
8 år sedan
Brad Thurber
c4ef48c5e8
add new gitfs functionality
8 år sedan
puneet kandhari
6578fb2ae2
Merge pull request #219 from UtahDave/master
Use the latest stable salt from repo.saltstack.com
8 år sedan
David Boucha
cca75d93d7
Use the latest stable salt from repo.saltstack.com
8 år sedan
puneet kandhari
d0d4a6cc6b
Merge pull request #218 from UtahDave/master
Comment out second master config example
8 år sedan
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
8 år sedan
Wolodja Wentland
633ce3630f
Merge pull request #216 from centromere/driver-version-check
Added version check for provider/driver backwards compatibility
8 år sedan
John Galt
e26b805279
Added version check for provider/driver backwards compatibility
8 år sedan
Nitin Madhok
29d4a55828
Merge pull request #215 from centromere/provider-fix
Renamed "provider" to "driver"
8 år sedan
John Galt
c4208bb661
Renamed "provider" to "driver"
8 år sedan
Forrest
4acd1711a2
Merge pull request #214 from irtnog/fix-paths-freebsd
Prefix configuration files with the suitable O/S-specific pathname
8 år sedan
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`.
8 år sedan
Matthew X. Economou
001b034eb5
Replace absolute config pathname prefixes with the config_path variable
8 år sedan
Forrest
ed4fcbc541
Merge pull request #213 from aboe76/spm_formula
add formula file this fixes #211
8 år sedan
Niels Abspoel
398d71d392
add formula file
8 år sedan
Forrest
59ee0c7761
Merge pull request #212 from genuss/mine_functions
Take mine_functions back
8 år sedan
a.genus
e97822a0d5
Take mine_functions back
8 år sedan
Forrest
7856b5ea9a
Merge pull request #210 from iamseth/master
Add Windows support to map.jinja
8 år sedan
Seth Miller
c7552b6d0a
Add Windows support to map.jinja
This adds some minimal support for Windows minions.
8 år sedan
Forrest
7abdf217a9
Merge pull request #205 from myii/PR_FixWindowsRepoSettings
Fix Windows repo settings using values from 2015.8 documentation
8 år sedan
Imran Iqbal
7f36259614
Remove excessive blank lines rendered after "Miscellaneous settings"
8 år sedan
Imran Iqbal
c4e116ee8f
Provide Windows repo settings: 2015.8+ master used for pre-2015.8 minions
8 år sedan
Imran Iqbal
7474d4239d
Fix Windows repo settings using values from 2015.8 documentation
8 år sedan
Nitin Madhok
043433b90a
Merge pull request #204 from aboe76/master
update 2015.8.7 version config for the minion
8 år sedan
Niels Abspoel
a4c5b4f322
update 2015.8.7 version config for the minion
8 år sedan
Forrest
a8ced2e98f
Merge pull request #203 from aboe76/master_config_2015.8.7
merge options from 2015.8.7 version in f_defaults.conf
8 år sedan
Niels Abspoel
bfcaca38a6
merge options from 2015.8.7 version in f_defaults.conf
8 år sedan
Forrest
8573ba96e2
Merge pull request #202 from irtnog/revert-pr200
Revert PR #200
8 år sedan
Matthew X. Economou
e8021220b8
Revert PR #200
This restores the original structure/behavior of the
`salt_formulas` Pillar key.
8 år sedan
Forrest
b47fec3564
Merge pull request #200 from thomaslarsen/master
Support for downloading formulas from multiple baseurls into same environment
9 år sedan
Thomas Larsen
bbeacc4ace
Fixed typo in `pillar.example`
9 år sedan
Thomas Larsen
d1cbec3fe2
Added support for downloading formulas from multiple baseurls into the same environment.
9 år sedan
Forrest
337c48b14c
Merge pull request #199 from kevinschmidt/master
add consul config support to master config file
9 år sedan
Kevin Schmidt
ce6849247e
add consul config support
9 år sedan
Forrest
0fee3f58f2
Merge pull request #196 from iamseth/master
Replace pkgrepo with offical Saltstack repo
9 år sedan
Forrest
8617db1536
Merge pull request #198 from kevinschmidt/master
add support for gitfs whitelist and blacklist
9 år sedan
Kevin Schmidt
41f2de74bd
* add gitfs whitelist and blacklist
9 år sedan
Niels Abspoel
adb0c7008d
removing accidentally committed files
9 år sedan
Niels Abspoel
cbe5763668
fix pillar and libvirt
9 år sedan
Seth Miller
8f2191471b
Replace pkgrepo with offical Saltstack repo
issue #180
9 år sedan