Dafydd Jones
8e41067c69
allow non-default config settings in master.d/f_defaults.conf (similar to PR#247)
8 年之前
Brian Jackson
d68c0b63ee
Merge pull request #267 from fizmat/pkgrepo-cleanup
Pkgrepo cleanup
8 年之前
Forrest
111cbd44d1
Merge pull request #269 from mattwillsher/smartos-support
Correct SmartOS config path
8 年之前
Matt Willsher
157f356442
Correct SmartOS config path
8 年之前
Forrest
88794c8c62
Merge pull request #268 from mattwillsher/smartos-support
Add SmartOS salt-master, minion and gitfs support
8 年之前
Matt Willsher
5b87c50e46
Add SmartOS salt-master and gitfs support
8 年之前
Forrest
af02bc5b78
Merge pull request #266 from fizmat/arch-update
update map.jinja after Arch renamed the package
8 年之前
Ivan Kadochnikov
8552113226
update map.jinja after Arch renamed the package
8 年之前
Ivan Kadochnikov
fd0b200fea
Delete repotype from map.jinja, unused after 8f2191471
8 年之前
Ivan Kadochnikov
e18eeffb5e
Delete debian saltstack repo gpg, not used since 87f3e849d2
8 年之前
Ivan Kadochnikov
fcefad0899
Delete pkgrepo/ubuntu, not used anymore
8 年之前
Ivan Kadochnikov
13ea551011
Simplify pkgrepo logic, made possible by 3b265a544
8 年之前
Forrest
01043740dc
Merge pull request #259 from kakwa/separate_engines_config
make the configuration of engines specific to master or minion
8 年之前
Niels Abspoel
ff8bf379a7
Merge pull request #261 from fizmat/pkgrepo-redhat
Add state that ensures pkgrepo for RedHat is absent
8 年之前
Forrest
f6551c5fc8
Merge pull request #265 from genuss/pillar_opts
Change default value for pillar_opts
8 年之前
genuss
8fd8c76d5f
Change default value for pillar_opts
8 年之前
Forrest
d6affbba39
Merge pull request #263 from robruma/feature/support_master_id_option
Adding support for master_id option
8 年之前
Rob Ruma
6f4880a258
Adding support for master_id option documented in https://docs.saltstack.com/en/latest/ref/configuration/master.html#master-id
8 年之前
Ivan Kadochnikov
423d58dd88
Add state that ensures pkgrepo for RedHat is absent
8 年之前
Forrest
07aa250925
Merge pull request #260 from mothbe/master
typo - top_file_merging_strategy (f_defaults.conf) template
8 年之前
Marcin Witowski
9d0b6b03d8
fix typo for top_file_merging_strategy in salt/files/master.d/f_defaults.conf template
8 年之前
carpenti
3098aebcad
add engines as a reserved_keys to not add generic configuration
8 年之前
carpenti
08d10376ab
implementing retro-compatible behavior
Using the old salt.engines pillar and merging it with the new
salt.[master|minion].engines pillar.
This way, it doesn't break previous behavior and permits to define
common engines on master and minion.
In the merge, the salt.[master|minion].engines pillar takes precedence
if conflict as it's the more specific pillar.
8 年之前
carpenti
c27bfd92b7
make the configuration of engines specific to master or minion
the engines are now configured using the following pillars:
* salt.master.engines
* salt.minion.engines
instead of a global salt.engines pillar.
Note: the pillar.example provided seems to assume this behaviour.
(the pillar is salt.master.engines.slack and not salt.engines.slack)
8 年之前
Forrest
5e9c937931
Merge pull request #258 from aboe76/enable_salt_minion_standalone
fix minion daemon to be enabled if master_type is set to disable
8 年之前
Niels Abspoel
64e7376fe4
fix minion daemon to be enabled if master_type is set to disable
8 年之前
Forrest
e76880d500
Merge pull request #257 from aboe76/salt-minion_standalone_with_service
add option to start minion service if master_type is set to disable
8 年之前
Niels Abspoel
1ffbb4b6bc
add option to start minion service if master_type is set to disable
8 年之前
Forrest
e464109c92
Merge pull request #256 from aboe76/missing_files
add missing files
8 年之前
Niels Abspoel
13a6ecf8b9
add missing files
8 年之前
Forrest
894351b248
Merge pull request #255 from aboe76/minion_engines_reactors
add engine and reactor config to salt minion configuration
8 年之前
Niels Abspoel
ddaa166de2
add engine and reactor config to salt minion configuration
8 年之前
Javier Bértoli
4e8d36f308
Merge pull request #253 from jerrykan/cloud_without_pip
By default don't install cloud dependencies using pip
8 年之前
John Kristensen
37f82242e7
By default don't install cloud dependencies using pip
The salt-cloud packages automatically pull in the pycrypto and libcloud
dependencies for RedHat and Debian (at least when using the SaltStack
repos), so it doesn't really make sense to install these dependencies
using pip. By default we no longer use pip, but the old behaviour can be
restored by setting 'salt:use_pip' to True in the pillar.
There could probably be a case made for removing the pip stuff
altogether, but we will leave it in for the time being to preserve some
backwards compatibility.
8 年之前
Forrest
ad440d904c
Merge pull request #250 from luitzifa/master
Fixes saltstack-formulas/salt-formula#190
8 年之前
Daniel Krämer
749bf0e863
[BIGFUX] make pygit2 work with ubuntu xenial
8 年之前
Forrest
52bc1badca
Merge pull request #251 from UGNS/master
Clean-up master.d/f_defaults.conf and add winrepo_provider
8 年之前
Jeremy T. Bouse
4283cba123
Add example for winrepo_provider
8 年之前
Daniel Krämer
a842dbe621
Fixes saltstack-formulas/salt-formula#190
8 年之前
Jeremy T. Bouse
79fcda8806
Clean up formating of nodegroups
8 年之前
Jeremy T. Bouse
a89d8d9b6b
Add winrepo_provider to master.d/f_defaults.conf
8 年之前
Forrest
2a80f55a17
Merge pull request #249 from msciciel/salt-master-yaml-utf8
Add yaml_utf8 option to salt master configuration.
8 年之前
Krzysztof Pawłowski
776c5ecbe6
Add yaml_utf8 option to salt master configuration.
8 年之前
Forrest
5dd3eac097
Merge pull request #247 from mrichar1/other_opts
Handle config opts not part of default config.
8 年之前
Matthew Richardson
89ece150e6
Tidy up comments, add some docs/examples.
8 年之前
Matthew Richardson
5abdaee5a2
Handle config opts not part of default config.
8 年之前
Niels Abspoel
39a329b693
Merge pull request #245 from UGNS/raspbian
Fix URLs in salt.pkgrepo for Raspbian & Ubuntu
8 年之前
Jeremy T. Bouse
3b265a544a
Fix URLs in salt.pkgrepo for Raspbian & Ubuntu
Rasbian reports back the following grain values:
local:
----------
os:
Raspbian
os_family:
Debian
osarch:
armhf
osmajorrelease:
8
osrelease:
8.0
Ubuntu reports back the following grain values:
local:
----------
os:
Ubuntu
os_family:
Debian
osarch:
amd64
osmajorrelease:
14
osrelease:
14.04
For Raspbian the osarch needed to be changed from other Debain os_family
distributions.
For Ubuntu the osrelease value is needed instead of osmajorrelease as other
Debian os_family distributions.
Part of #180
8 年之前
Forrest
8050f6cf95
Merge pull request #243 from pcdummy/master
https for the ubuntu repo and option to remove /etc/salt/minion.
8 年之前
Rene Jochum
f17b8f5424
Add optional method to remove /etc/salt/master.
Signed-off-by: Rene Jochum <rene@jochums.at>
8 年之前