puneet kandhari
4eb6d87870
Merge pull request #144 from peterdemin/master
formulas.jinja: python 2.6 support
9 роки тому
Petr Demin
d4180295e3
formulas.jinja: python 2.6 support
9 роки тому
puneet kandhari
975dd08885
Merge pull request #143 from aboe76/slspath_variable
Remove hardcoded paths with {{ slspath }} variable
9 роки тому
Niels Abspoel
6ec31374cb
Remove hardcoded paths with {{ slspath }} variable
9 роки тому
Brian Jackson
62a13de7d5
Merge pull request #141 from willshersystems/develop
The git command line tool is a requirement of pygit2
9 роки тому
Matt Willsher
1cf72d85f8
The git command line tool is a requirement of pygit2
9 роки тому
puneet kandhari
8d8371f19d
Merge pull request #139 from willshersystems/centos
Improved support for Enterprise Linux family OSs (CentOS, RHEL etc)
9 роки тому
Matt Willsher
e2d192ba89
Improvements to Enterprise Linux family OSs.
* Install pygit from package
* Add Official Salt ZeroMQ 4 COPR repository
Note that Salt itself is assumed to already to be available to the system via yum, via EPEL for example
9 роки тому
Forrest
bffb87c29f
Merge pull request #137 from puneetk/master
Remove Duplicates from defaults.yaml and map.jinja
9 роки тому
puneet kandhari
145b58a9d3
Remove Duplicates from defaults.yaml and map.jinja
9 роки тому
Nitin Madhok
d16abf86b6
Merge pull request #135 from aboe76/fix_empty_formula_pillar
fix empty formulas list in pillar with empty dic.
9 роки тому
Niels Abspoel
14c262fdad
fix empty formulas list in pillar with empty dic.
9 роки тому
Niels Abspoel
efd15e0896
Merge pull request #134 from edvinasme/pillar-roots-format
Fix pillar_roots configuration format in master
9 роки тому
Edvinas Klovas
8992e15882
fix typo
9 роки тому
Edvinas Klovas
47b37f2ffb
Fix pillar_roots configuration format in master
This commit fixes how `pillar_roots` are generated and after this fix the
generated configuration does not contain any unnecessary new lines:
```yaml
pillar_roots:
base:
/srv/salt/dir1
dev:
/srv/salt/dir2
/srv/salt/dir3
locale:
/srv/salt/dir4
```
Before this commit the pillar_roots in `f_defaults.conf` for master would be
generated with a lot of empty lines in between directories, like this:
```yaml
pillar_roots:
base:
/srv/salt/dir1
dev:
/srv/salt/dir2
/srv/salt/dir3
local:
/srv/salt/dir4
```
The minion configuration is not affected and renders fine.
9 роки тому
Brian Jackson
b3db6e2a76
Merge pull request #133 from edvinasme/pillar-update
add pillar_roots for minion and master in pillar.example
9 роки тому
Edvinas Klovas
47b75d05c7
add pillar_roots for minion and master in pillar.example
9 роки тому
Wolodja Wentland
46f44c1dbe
Merge pull request #132 from txomon/patch-2
Cleanup template for easier user reading
9 роки тому
Javier Domingo
4344a1311b
Cleanup template for easier user reading
The user will already have it's /etc/salt/minion file, so it doesn't need all this info, and it makes easier to know what has been generated and what not
9 роки тому
Brian Jackson
54a5c85771
Merge pull request #129 from julienlavergne/setup
fixed missing add-apt-repository command when ubuntu is the server one
9 роки тому
Julien Lavergne
09073ebed8
optimized setup bootstrap
9 роки тому
Julien Lavergne
e87132cf1c
fixed missing add-apt-repository command when ubuntu is the server one
9 роки тому
Brian Jackson
31a117e58a
Merge pull request #125 from julienlavergne/setup
fixed wrong command name: add-apt-repository became apt-add-repository
9 роки тому
Julien Lavergne
df05eb70d8
fixed wrong command name: add-apt-repository became apt-add-repository
9 роки тому
Forrest
b36800f07e
Merge pull request #123 from andrew-vant/providers-oops
ec2/gce profiles/providers are no longer configured if they are not used
9 роки тому
Andrew Vant
a01249a7fc
ec2/gce profiles/providers are no longer configured if they are not used.
Needed because salt-cloud will attempt to load them even if they are
filled with invalid default values, creating error spam.
9 роки тому
Matt Parlette
efcefd6579
Updated master.d/f_defaults for 2014.7
Added config setting for:
* pillar_source_merging_strategy
9 роки тому
Brian Jackson
15e63e8fd0
Merge pull request #117 from andrew-vant/cloud-templates-redirect
Added pillar option to redirect profile and map folders.
9 роки тому
Andrew Vant
e632b8bcb5
Cloud file.recurse loop no longer hardcodes folder list.
9 роки тому
Andrew Vant
ba143c1810
Updated pillar.example with the correct defaults for template_sources.
9 роки тому
Nitin Madhok
2a35c7227e
Merge pull request #121 from gravyboat/master
Change spaces to dashes in IDs for ssh.sls
9 роки тому
Forrest Alvarez
d3adb685b6
Change spaces to dashes in IDs for ssh.sls
9 роки тому
Forrest
6d12e55d51
Merge pull request #119 from smlloyd/master
Exclude require statement when install_packages is False.
9 роки тому
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 роки тому
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 роки тому
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 роки тому
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 роки тому
Andrew Vant
fb1d7e8d3b
Added pillar option to redirect profile and map folders.
9 роки тому
Nitin Madhok
1f43b96a00
Merge pull request #116 from andrew-vant/mine_functions
Added mine_functions to f_defaults.conf.
9 роки тому
Andrew Vant
2d986eaa3f
Updated pillar.example with mine example.
9 роки тому
Andrew Vant
11efee54c3
Added mine_functions to f_defaults.conf.
9 роки тому
Nitin Madhok
a11c39cf32
Merge pull request #111 from iggy/master
Switch config file.recurse to clean by default and tell it to ignore _*
9 роки тому
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 роки тому
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 роки тому
Nitin Madhok
74d9ce2a01
Merge pull request #112 from aboe76/fix_api_recursion
Fix recursion in api.service
9 роки тому
Niels Abspoel
9ae8a4d746
Fix recursion in api.service
9 роки тому
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 роки тому
Forrest
e6045d873a
Merge pull request #110 from iggy/master
Add modules to install gitfs backend dependencies
9 роки тому
Brian Jackson
4533cc7d0e
Add modules to install gitfs backend dependencies
Add modules for gitfs dependencies and documentation for how to use them.
9 роки тому
Forrest
d8bf7cdbf0
Merge pull request #108 from iggy/master
Add setting to not install packages
9 роки тому