31e2d95203
Merge pull request #339 from dafyddj/win-restart
...
Fix Windows minion restart command
2017-12-23 11:41:06 +01:00
24998a4a0b
Merge pull request #332 from mchugh19/indenting
...
peer run space and jason to yaml
2017-11-21 11:33:06 +01:00
fa657a850e
add also default git values for SUSE osfamily ( #344 )
...
they get overwritten from defaults.yaml if not specified
2017-11-21 00:18:22 +01:00
3fd9b0964d
add default values for SUSE osfamily ( #343 )
2017-11-20 23:34:09 +01:00
d987901db2
fix windows minion restart command
2017-10-16 17:09:19 +01:00
01564c3753
Change cmd.wait to cmd.run ( #336 )
...
Changing cmd.wait to cmd.run as recomended on the documentation: https://docs.saltstack.com/en/latest/ref/states/all/salt.states.cmd.html#salt.states.cmd.wait
2017-10-01 20:22:11 +02:00
9ef5335f7b
Update f_defaults.conf to support elasticsearch returner ( #335 )
...
Proposed pull request for elasticsearch returner in the minion.d/f_defaults.conf file
2017-09-29 22:13:00 +02:00
3c88ad9918
Add pyinotify entry for Gentoo, refs #331
2017-09-11 14:32:47 +02:00
413a2eae30
Merge pull request #331 from chessclub/fix-inotify-beacon-dependency
...
Added support for installing pyinotify when using inotify beacons
2017-08-29 00:12:13 +02:00
d5c10f5600
fix indenting around peer run. Convert extra configs from json to yaml
2017-08-28 07:04:43 +01:00
80a160a810
Added default pyinotify package name for archlinux.
2017-08-16 07:20:00 +00:00
e94f15d0fe
Added support for installing pynotify when inotify beacons are configuredwq
2017-08-15 20:48:15 +00:00
e2973c644d
fix iteritems() with items()
2017-08-14 13:15:30 +02:00
d6389b8a24
Merge pull request #313 from iondulgheru/master
...
Fix master_tops configuration rendering
2017-08-13 22:38:48 +02:00
e8ef3c1446
adding salt-minion restart option from official FAQ page
2017-07-27 13:15:21 -07:00
9cf5cd2c00
Merge pull request #319 from genuss/restart_via_at
...
Add restart minion via at (fixes #136 )
2017-07-26 21:45:25 +02:00
c265206e94
Merge pull request #323 from aquto/master
...
Enable option to set minion scheduler
2017-07-25 16:37:25 +02:00
ec8241c6fd
Added minion scheduler configuration
2017-07-25 10:13:51 -04:00
4437f7b2e1
Fixed map.jinja to work with 2017.7.0
2017-07-18 16:18:44 -04:00
27c69a8a93
enable the syndic service
2017-06-29 13:05:15 +02:00
739be9550f
Merge pull request #316 from cmclaughlin/remove-env-comments
...
Remove "source" comments from Saltify configs
2017-06-16 12:17:20 +02:00
0e8573d13a
Fix typo
2017-06-15 13:30:30 +03:00
22ad7db7c0
Add restart minion via at ( fixes #136 )
2017-06-14 19:28:11 +03:00
b8273b9c3f
Fix lists join error ( #317 )
2017-06-09 08:34:55 -03:00
3a261c7da0
Update comment for consistency
2017-06-07 14:55:25 -07:00
316622ef9b
Remove "source" comments from Saltify configs
...
I use Salt environments to provide each of my team mates the ability to develop
and test their Salt changes. And I've found that when we run this formula from
our environments against our salt-master, comments in some files change. For us
this represents an unwanted and unplanned change. I understand the intention -
to identify how or why the file changed, but I firmly believe that we should
be able to run highstsate with test=True and only see intended changes. Here's
an example:
ID: salt-cloud-providers
Function: file.recurse
Name: /etc/salt/cloud.providers.d
Result: None
Comment: #### /etc/salt/cloud.providers.d/saltify.conf ####
The file /etc/salt/cloud.providers.d/saltify.conf is set to be changed
Started: 20:01:28.586441
Duration: 75.185 ms
Changes:
----------
/etc/salt/cloud.providers.d/saltify.conf:
----------
diff:
---
+++
@@ -1,4 +1,4 @@
-# This file is managed by Salt via salt://salt/files/cloud.providers.d/saltify.conf?saltenv=myenv
+# This file is managed by Salt via salt://salt/files/cloud.providers.d/saltify.conf?saltenv=dev
saltify:
provider: saltify
2017-06-07 13:39:35 -07:00
83433c8dd8
Merge pull request #312 from netmanagers/master
...
Allow to specify reactors separatedly for master and minions
2017-06-03 19:28:05 +02:00
5c3dc73f2a
fix map.jinja
...
add missing comas
2017-05-31 22:53:48 +02:00
6622d177bf
add a way to set which release of saltstack to use
...
SaltStack provides "versioned" repositories, this commit add a way
to set which release of salt to use.
It adds a pillar "salt:release" which can be set to a specific release
(ex: 2016.11). This release is then used to configure properly the
repositories URLs for Debian/Ubuntu/RedHat.
The default behavior is to point to 'latest', retaining the previous
behavior if the "salt:release" pillar is not set.
2017-05-30 09:18:54 +02:00
165f2d727c
Fix master_tops configuration rendering
2017-05-24 18:31:36 +03:00
9331997269
Exclude reactors from f_defaults.conf
2017-05-22 20:56:13 -03:00
561eb4c5c8
Reactors should be in an array
2017-05-22 19:34:31 -03:00
442806ab9e
Allow to specify different reactors for minions and masters
2017-05-22 19:20:36 -03:00
68a2b72519
Fix rendering of external_auth config.
...
This now properly also supports per user, per minion as well as
function argument limiting.
2017-05-09 13:34:44 +02:00
87074cf3d9
Do not sync salt-cloud provided default configuration by default
...
As discussed in PR#305, these are defaults that even if they are
configurable as probably not suited to a majority of users and causes
delete/add output on highstate of user of the formula choses to use
the same file name.
2017-04-11 13:54:05 +02:00
4b29379725
Rework salt-cloud directories and files creation
...
Since the set of directories is known, just iterate of its well known
names directly. Make sure files are dumped after `file.recurse` to avoid
deletion/creation cycles when applying highstate.
Also apply permissions on cloud.providers.d after all creations steps
are done.
2017-04-11 13:34:50 +02:00
dce9bea40b
Compact salt-cloud pip.installed instructions
2017-04-11 13:34:50 +02:00
7093a32968
Simplify logic
2017-04-10 12:14:12 -03:00
997194c992
Wrong list name in config file
2017-04-10 12:11:09 -03:00
edce95f949
Updated master and minion default config files
...
Added parameters new to 2016.03 (or simply missing in the existing config).
2017-04-09 14:27:30 -03:00
03ec0dce2d
Merge pull request #301 from vquiering/move_to_publisher_acl
...
Add new publisher_acl to salt master config
2017-04-08 12:05:15 +02:00
ca204ea8c4
Merge pull request #302 from vquiering/fix_external_auth_config
...
add salt master config template external_auth settings
2017-04-08 12:04:57 +02:00
57498d1645
add syndic_user option in the master config
2017-04-07 12:12:21 +02:00
f7189e2900
User publisher_acl setting in salt master config even if used client_acl in
...
pillar (backwards compatibility)
2017-03-27 08:39:05 +02:00
894bd15c79
fix salt master config template to use external_auth settings
2017-03-25 19:59:16 +01:00
d3b46a3648
add publisher_acl to salt master config
2017-03-24 13:07:19 +01:00
e86e6fc221
Work around missing `is mapping` on CentOS/RHEL 6
...
Checks for 'dict' in `x.__class__.__name__` b/c
neither `type()` nor `isinstance()` is available.
2017-02-24 18:10:54 +01:00
5327e921fe
Hack to make rendering work on CentOS 6
...
!! Not tested with an actual !!
!! configured `ext_pillar` yet !!
- jinja on RHEL/CentOS 6 has no 'mapping'
test (see salt-formula issue #193 )
- {% do ... %} allows no assignment, only
function calls
- of course, `type(foo) is dict` doesn't
work because it's no jinja test
- maybe `.isinstance()` would be nicer/more
reliable
2017-02-24 13:40:40 +01:00
ef120e56bc
fixed key reserved for lxc_profile file
2017-02-23 23:51:14 +01:00
a26e82f530
Merge pull request #288 from aboe76/fix_beacons
...
fix beacons on dev
2017-02-01 22:53:44 +01:00
c685ca7767
Merge pull request #277 from Furlot/patch-1
...
Add http proxy support for minion
2017-01-22 23:45:25 +01:00
2e792584d2
Merge pull request #281 from vermut/patch-1
...
Fixes jinja in include block
2017-01-22 23:37:28 +01:00
724e603689
Merge pull request #283 from irtnog/fix-root-group-bsd
...
Use a different group name for GID 0 depending on the minion's O/S
2017-01-22 23:35:52 +01:00
5ffed7de5c
fix beacons on dev
2017-01-21 22:58:31 +01:00
cb050736b0
Merge pull request #279 from aboe76/fix_pillar_dict_with_default_merge
...
fix default dict warning with saltstack dev version
2017-01-21 11:41:49 -08:00
b4d55b80f9
Merge pull request #285 from leansalt/archlinux-pygit-libgit2
...
Arch Linux: install pygit2 or libgit2 via pacman instead of source
2017-01-15 12:03:45 +01:00
d3dfd1b967
Merge pull request #287 from ek9/alpine-linux-support
...
Alpine Linux: add basic support
2017-01-14 12:09:15 -08:00
d7af7c15bb
Alpine Linux: add basic support
2017-01-13 17:31:47 +01:00
8ae39f4700
Arch Linux: install pygit2 or libgit2 via pacman instead of source by default
2017-01-13 17:03:19 +01:00
c43657487f
Merge branch 'master' of github.com:saltstack-formulas/salt-formula into fix-root-group-bsd
2017-01-13 10:21:14 -05:00
3746f08f2f
Use a different group name for GID 0 depending on the minion's O/S
...
Some Unix variants name GID 0 "wheel". Unfortunately, one cannot
specify this group by ID, because Python conflates integer 0 with
boolean False, nor can one specify this group using the string '0',
because of assumptions in the Salt or Python codebases regarding group
names.
2017-01-13 10:14:34 -05:00
fc40847542
fixed beacon variable name
2017-01-13 15:26:17 +01:00
73906a03a5
added beacons configuration support
2017-01-13 14:22:39 +01:00
bad783ea28
Fixes jinja in include block
...
Some vars were missing {{ }}
Indentation was broken
isinstance is not available in Salt
2017-01-13 14:58:59 +02:00
caff23424d
fix default dict
2017-01-12 23:40:41 +01:00
45e686b7f2
Add http proxy support for minion
2017-01-06 17:12:59 +01:00
f58562beeb
Merge pull request #276 from saltstack-formulas/fix_pygit2_debian
...
Fix pygit2-libgit2 builds on Debian like platforms.
2016-12-25 23:17:47 -08:00
e329bda7bf
Fix pygit2-libgit2 builds on Debian like platforms.
...
Signed-off-by: Rene Jochum <rene@jochums.at>
2016-12-25 17:41:47 +01:00
0166cd4097
Added fedora.
2016-12-19 23:29:42 -05:00
43663fec1b
Have salt-api service watch the master config files
...
The salt-api service is configured using the master config files but is
not restarted when the master is restarted. We need the salt-api service
to watch the master config files to ensure that any config changes are
picked up.
2016-12-08 12:19:53 +11:00
8e41067c69
allow non-default config settings in master.d/f_defaults.conf (similar to PR#247)
2016-12-01 21:30:12 +00:00
d68c0b63ee
Merge pull request #267 from fizmat/pkgrepo-cleanup
...
Pkgrepo cleanup
2016-11-21 22:53:47 -08:00
157f356442
Correct SmartOS config path
2016-11-14 22:22:52 +00:00
5b87c50e46
Add SmartOS salt-master and gitfs support
2016-11-14 22:13:52 +00:00
8552113226
update map.jinja after Arch renamed the package
2016-11-10 16:05:48 +03:00
fd0b200fea
Delete repotype from map.jinja, unused after 8f2191471
2016-11-10 11:09:19 +03:00
e18eeffb5e
Delete debian saltstack repo gpg, not used since 87f3e849d2
2016-11-10 11:09:19 +03:00
fcefad0899
Delete pkgrepo/ubuntu, not used anymore
2016-11-10 11:09:19 +03:00
13ea551011
Simplify pkgrepo logic, made possible by 3b265a544
2016-11-10 11:09:19 +03:00
01043740dc
Merge pull request #259 from kakwa/separate_engines_config
...
make the configuration of engines specific to master or minion
2016-11-09 12:08:33 -08:00
ff8bf379a7
Merge pull request #261 from fizmat/pkgrepo-redhat
...
Add state that ensures pkgrepo for RedHat is absent
2016-11-09 20:46:34 +01:00
f6551c5fc8
Merge pull request #265 from genuss/pillar_opts
...
Change default value for pillar_opts
2016-11-09 10:01:41 -08:00
8fd8c76d5f
Change default value for pillar_opts
2016-11-09 20:48:15 +03:00
6f4880a258
Adding support for master_id option documented in https://docs.saltstack.com/en/latest/ref/configuration/master.html#master-id
2016-10-14 08:25:18 -04:00
423d58dd88
Add state that ensures pkgrepo for RedHat is absent
2016-10-07 16:50:46 +03:00
9d0b6b03d8
fix typo for top_file_merging_strategy in salt/files/master.d/f_defaults.conf template
2016-10-07 00:48:59 +02:00
3098aebcad
add engines as a reserved_keys to not add generic configuration
2016-10-05 22:28:33 +02:00
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.
2016-10-05 21:14:00 +02:00
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)
2016-10-05 10:26:36 +02:00
64e7376fe4
fix minion daemon to be enabled if master_type is set to disable
2016-10-01 11:31:56 +02:00
1ffbb4b6bc
add option to start minion service if master_type is set to disable
2016-10-01 09:47:29 +02:00
13a6ecf8b9
add missing files
2016-09-30 22:00:11 +02:00
4e8d36f308
Merge pull request #253 from jerrykan/cloud_without_pip
...
By default don't install cloud dependencies using pip
2016-09-21 06:35:17 -03:00
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.
2016-09-21 17:01:37 +10:00
ad440d904c
Merge pull request #250 from luitzifa/master
...
Fixes saltstack-formulas/salt-formula#190
2016-09-13 09:33:59 -07:00
749bf0e863
[BIGFUX] make pygit2 work with ubuntu xenial
2016-09-13 09:03:06 +02:00
a842dbe621
Fixes saltstack-formulas/salt-formula#190
2016-09-05 10:48:31 +02:00
79fcda8806
Clean up formating of nodegroups
2016-09-04 15:00:03 +00:00
a89d8d9b6b
Add winrepo_provider to master.d/f_defaults.conf
2016-09-04 14:47:39 +00:00
776c5ecbe6
Add yaml_utf8 option to salt master configuration.
2016-08-24 13:06:24 +02:00
89ece150e6
Tidy up comments, add some docs/examples.
2016-08-23 09:48:39 +01:00
5abdaee5a2
Handle config opts not part of default config.
2016-08-22 11:22:08 +01:00
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
2016-08-13 15:29:03 -04:00
f17b8f5424
Add optional method to remove /etc/salt/master.
...
Signed-off-by: Rene Jochum <rene@jochums.at>
2016-07-15 15:13:21 +02:00
1b611c871e
Add optional method to remove /etc/salt/minion.
...
Signed-off-by: Rene Jochum <rene@jochums.at>
2016-07-15 15:11:55 +02:00
fa6818af35
Use https for the Ubuntu repo same as salt-bootstrap.
...
Signed-off-by: Rene Jochum <rene@jochums.at>
2016-07-14 18:20:04 +02:00
12390494cf
Add support for s3fs
2016-07-09 08:29:33 -04:00
6ae81a9640
Add support for mongodb connection settings to config templates.
...
Signed-off-by: Rene Jochum <rene@jochums.at>
2016-07-07 18:44:51 +02:00
478fef683b
Remove trailing whitespaces in config templates.
...
Signed-off-by: Rene Jochum <rene@jochums.at>
2016-07-07 16:22:16 +02:00
621e1f218c
Add support for OpenBSD in map.jinja
2016-07-01 21:25:06 -05:00
5f03ce9db1
Merge pull request #234 from rhertzog/pkgrepo-update
...
Use repo.saltstack.com in salt.pkgrepo for Debian-based distributions
2016-06-30 09:21:18 -07:00
137868bcc1
Merge pull request #237 from msonawane/master
...
add module_config for minions
2016-06-26 18:40:47 -07:00
98d591eab2
add module_config for minions
2016-06-27 01:34:05 +00:00
ee06702fca
Use repo.saltstack.com in salt.pkgrepo for Debian-based distributions
...
repo.saltstack.com handles all currently supported Debian releases as well
as all supported Ubuntu releases so this change should be fine.
Part of #180 .
2016-06-20 22:36:54 +02:00
182098fc16
JSON encode values embedded in the salt-master's configuration file
...
This avoids problems when values are strings containing colons. And it
mimicks what was already done for the salt-minion's configuration file.
Fixes #233 .
2016-06-20 22:24:20 +02:00
ca42d40ef9
added support for LXC profiles
2016-06-07 19:46:08 +02:00
3bc5aa3bce
Merge pull request #231 from rocket-labs-sysadmins/master
...
GitPython package name is fixed for RedHat-based OS
2016-05-30 11:32:02 -07:00
6690e8b103
Fixing GitPython package name for RedHat OS family. Tested on CentOS 7.
2016-05-30 13:50:16 +02:00
adad72741e
Render config as JSON
2016-05-29 20:43:45 +02:00
ac4ed62c03
Support engine configuration
2016-05-27 23:27:55 -05:00
b9ae603fd7
Add support for master eauth LDAP config
2016-05-26 10:52:10 -04:00
b3a3fa4d72
Ability to create non-templated cloud config files (maps/providers/profiles).
2016-05-06 14:45:41 -04:00
d2df211011
allow state to function without errors if no keys are find in pilar
2016-05-02 09:13:38 -04: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
e26b805279
Added version check for provider/driver backwards compatibility
2016-03-31 23:17:35 -07:00
c4208bb661
Renamed "provider" to "driver"
2016-03-31 19:39:55 -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
e97822a0d5
Take mine_functions back
2016-03-25 16:58:06 +03:00
c7552b6d0a
Add Windows support to map.jinja
...
This adds some minimal support for Windows minions.
2016-03-22 20:15:44 -05: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
a4c5b4f322
update 2015.8.7 version config for the minion
2016-02-20 23:25:06 +01:00
bfcaca38a6
merge options from 2015.8.7 version in f_defaults.conf
2016-02-20 21:07:17 +01: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
d1cbec3fe2
Added support for downloading formulas from multiple baseurls into the same environment.
2016-02-08 13:45:09 +00: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
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
3b8669cd67
dropped ppa and updated to official repos for ubuntu
2015-12-24 13:28:35 -05:00
02be0b1367
add support for returner setting in minion configuration
2015-12-21 15:00:35 +01:00
6d9683ca1f
Add clean_file to wipe saltstack.list contents
2015-12-09 23:33:00 +13:00
87f3e849d2
Make Debian use pkgrepo.managed and allow the repo name and key_url to be overridden via Pillar lookup.
2015-12-05 23:24:05 +13:00
3a83533669
fixed ext_pillar according to https://docs.saltstack.com/en/latest/topics/development/external_pillars.html#configuration and master_tops according to https://docs.saltstack.com/en/latest/topics/master_tops/index.html
2015-11-18 19:59:16 +01:00
8b39b37762
Replace deprecated iteritems() with items()
2015-11-16 22:05:36 -03:00
5c960fd2d8
Merge pull request #179 from blast-hardcheese/bugfix/178_master-configs-in-minion
...
Never fall back to `cfg_salt['master']` in minion config
2015-11-15 12:19:51 -08:00
d730d4f2b8
Using cfg_salt['master'] is never the right answer
...
- When it's iterable, the minion could be running on the master
- When it's a string, there's no advantage over just specifying
`salt:minion:master`
2015-11-15 12:11:20 -08:00
eeb7235ee0
Merge pull request #184 from 0xf10e/master
...
use salt_settings.syndic_service so state works on FreeBSD, too
2015-11-04 12:26:06 -08:00
8d1b382343
Merge pull request #183 from babilen/dev-show-jid
...
Manage show_jid option in master configuration
2015-10-13 12:00:56 -07:00
0216d66527
Remove trailing whitespace from master config
2015-10-13 16:37:14 +02:00
d7382e2d1f
use salt_settings.syndic_service so state works on FreeBSD, too
2015-10-13 15:41:41 +02:00
52893bc978
Manage show_jid in master configuration
...
This makes it easier for users to check the status of jobs that ran into
a timeout.
2015-10-13 14:56:51 +02:00
8d098484ed
Merge pull request #164 from genuss/sign_pubkey
...
Add master_type option
2015-09-29 09:44:14 -07:00
827ed47a25
Filter all calls to formulas_git_opt through load_yaml
...
Jinja macros are not actually functions. The only thing they can return
is a string. In order to return structured data, the callee must
serialize it, and the caller must deserialize it. This state formula
uses YAML as the intermediary, hence the occurrence of both the
`|yaml` (callee) and `|load_yaml` (caller) filters in its code.
The post-render "mapping values are not allowed here" error in
*salt/formulas.sls* or the broken rendering of
*salt/files/master.d/f_defaults.conf* happens because invocations of the
`formulas_git_opt` macro in several Jinja `set` statements do not get
deserialized, resulting in the trailing newline followed by three dot
characters (`...`), which YAML uses to signal the end of a document.
Correcting these rendering errors requires adding the necessary
deserialization code at those locations (i.e., filtering the macro call
through `|load_yaml`).
2015-09-03 14:56:45 -04:00
f0e691fa13
Fixed conflict with git-formula by allowing either inclusion of formula to install git dependency or specify a package name to install with a custom state ID.
2015-09-01 18:33:18 -05:00
9779609bc4
Remove mapping test
...
This test isn't available in certain popular versions of Jinja (namely the one
installed by default in CentOS 6).
2015-08-27 17:37:53 -05:00
addc6d5a26
Added logic to properly install pygit2 on ubuntu systems and made the pygit2 installation more flexible in general.
2015-08-20 02:46:16 -05:00
5db269e560
Merge pull request #166 from irtnog/enable-salt-api-service
...
Configure the salt-api service to start at boot time
2015-08-09 07:58:04 -04:00
02f7b279a1
Only watch salt-api package if install_packages=true
...
Also watch salt-api pkg instead of salt-master one.
2015-08-08 17:58:45 +02:00
825fd7cd77
Fixed pillar_roots generation for salt-master.
...
With a simple pillar like this::
$ sudo salt-call --config-dir /srv/etc/bootstrap --pillar-root /srv/pillar pillar.get salt:pillar_roots
local:
----------
base:
- /srv/pillar
This was generated in /etc/salt/master.d/f_defaults.conf::
# highstate format, and is generally just key/value pairs.
pillar_roots:base:- /srv/pillar
#
Resulting in parse errors by salt::
$ sudo salt '*' state.highstate
[ERROR ] Error parsing configuration file: /etc/salt/master.d/f_defaults.conf - while scanning a simple key
in "<string>", line 531, column 1:
pillar_roots:base:- /srv/pillar
^
could not found expected ':'
in "<string>", line 532, column 1:
#
^
[ERROR ] Error parsing configuration file: /etc/salt/master.d/f_defaults.conf - while scanning a simple key
in "<string>", line 531, column 1:
pillar_roots:base:- /srv/pillar
^
could not found expected ':'
in "<string>", line 532, column 1:
#
^
This patch will fix it as such::
ID: salt-master
Function: file.recurse
Name: /etc/salt/master.d
Result: True
Comment: Recursively updated /etc/salt/master.d
Started: 11:37:12.946823
Duration: 6255.296 ms
Changes:
----------
/etc/salt/master.d/f_defaults.conf:
----------
diff:
---
+++
@@ -528,7 +528,9 @@
# Pillar is laid out in the same fashion as the file server, with environments,
# a top file and sls files. However, pillar data does not need to be in the
# highstate format, and is generally just key/value pairs.
-pillar_roots:base:- /srv/pillar
+pillar_roots:
+ base:
+ - /srv/pillar
#
Resulting in::
# highstate format, and is generally just key/value pairs.
pillar_roots:
base:
- /srv/pillar
#
2015-08-06 11:37:55 +02:00
c014015e79
Configure the salt-api service to start at boot time
2015-08-02 21:17:36 -04:00
4ff1a746d6
Add master_type option
2015-07-29 19:48:56 +03:00
2af4bf3bb5
Merge pull request #161 from genuss/sign_pubkey
...
Add options for mult-master setup
2015-07-27 06:58:48 -05:00
ba9cc2605c
Use the py27-pygit2 package when installing pygit2 on FreeBSD
2015-07-24 17:06:15 -04:00
ea5a9f1f2c
Merge remote-tracking branch 'upstream/master' into fix-freebsd-gitpython-package
2015-07-24 16:53:24 -04:00
ef275bd138
Allow customizing the GitPython package name.
2015-07-24 16:31:00 -04:00
b477990830
Use the py27-GitPython package when installing GitPython on FreeBSD.
2015-07-24 16:30:02 -04:00
85a426ccdf
Add new `salt:python_git` key.
...
This key defaults to a value of `python-git`.
2015-07-24 16:27:52 -04:00
5b93601c78
Use the py27-salt package when installing salt-ssh on FreeBSD
...
On FreeBSD salt-ssh gets bundled into a single package with the other
SaltStack components (minion, master, etc.).
2015-07-24 16:11:23 -04:00
a738198d8b
Add verify_master_pubkey_sign
2015-07-24 17:58:41 +03:00
fffd30fe17
Add master_sign_pubkey option
2015-07-24 17:41:49 +03:00
4c1f57792a
Revert "Advance sal/api.sls, install rest_cherrypy or rest_tornado from pip."
...
This reverts commit 7bb82b0178
2015-07-20 17:05:57 -05:00
6e98d508c4
Revert "Fix salt/api.sls."
...
This reverts commit 8a1b8dc9db
2015-07-20 17:05:57 -05:00
d216a3f651
Revert "Install cherrypy/tornado from pip only if use_pip is True."
...
This reverts commit 90282eff03
2015-07-20 17:05:56 -05:00
8448aa4021
Revert "Fix stuff suggested by @iggy."
...
This reverts commit c5ae289fa1
2015-07-20 17:05:56 -05:00
ed3ab22a13
Revert "Add support for GitPython and salt-ssh on FreeBSD masters"
...
This reverts commit b03831c0b0
2015-07-20 17:05:56 -05:00
f9cb912a65
Revert "salt.api state fails"
...
This reverts commit 22b8dde1ff
2015-07-20 17:05:56 -05:00
ef73e4ce98
Revert "Change variable lookup to match usage in other states"
...
This reverts commit 14b466e022
2015-07-20 17:05:54 -05:00
b04fc8c843
Merge pull request #154 from irtnog/add-freebsd-support-saltssh-gitpython
...
Add support for GitPython and salt-ssh on FreeBSD masters
2015-07-14 06:43:03 -07:00
14b466e022
Change variable lookup to match usage in other states
...
Done at the maintainer's request.
2015-07-14 09:40:16 -04:00
22b8dde1ff
salt.api state fails
...
Seems there are several colons missing for salt.api to work correctly, hope I found all of them
2015-07-14 14:21:14 +02:00
b03831c0b0
Add support for GitPython and salt-ssh on FreeBSD masters
...
This change tweaks the GitPython package installation state to support
alternate package names (on FreeBSD, it's called "py27-GitPython").
Also, on FreeBSD salt-ssh is included in the "py27-salt" package by
default, requiring an update to `distro_map`.
2015-07-14 03:22:28 -04:00
c5ae289fa1
Fix stuff suggested by @iggy.
...
Signed-off-by: René Jochum <rene@jochums.at>
2015-07-13 22:31:32 +02:00
90282eff03
Install cherrypy/tornado from pip only if use_pip is True.
...
Signed-off-by: René Jochum <rene@jochums.at>
2015-07-13 22:08:20 +02:00
8a1b8dc9db
Fix salt/api.sls.
...
Signed-off-by: René Jochum <rene@jochums.at>
2015-07-13 13:46:17 +02:00
7bb82b0178
Advance sal/api.sls, install rest_cherrypy or rest_tornado from pip.
...
Signed-off-by: René Jochum <rene@jochums.at>
2015-07-13 13:37:10 +02:00
779e6c9c63
Merge pull request #122 from matthew-parlette/master
...
Updated master.d/f_defaults for 2014.7
2015-07-07 12:43:01 -05:00
645b4c65ce
Fix syntax error
2015-06-19 15:33:16 -06:00
8fcb42819b
Merge pull request #146 from quixoten/fix_syndic
...
Fix syndic requisites
2015-06-17 11:28:28 -05:00
8479111cbd
Fix syndic requisites
...
The syndic service was depending upon itself, which caused the salt run
to fail. This commit fixes that by depending on the salt-master service
rather than the salt-syndic service. I also made it more general by
using IDs to specify the provider rather than the name, which is a bit
less reliable.
2015-06-17 09:53:31 -06:00
eb421c676f
formulas.jinja: python 2.6 support
2015-06-17 17:51:40 +03:00
d4180295e3
formulas.jinja: python 2.6 support
2015-06-17 17:12:28 +03:00
6ec31374cb
Remove hardcoded paths with {{ slspath }} variable
2015-06-09 23:05:49 +02:00
1cf72d85f8
The git command line tool is a requirement of pygit2
2015-06-05 21:27:01 +01:00
Niels Abspoel
Theo Chatzimichos
Dafydd Jones
Alexandre Gomes
Andrew Ernst
Gilles Dartiguelongue
Christian McHugh
Tibold
Niels Abspoel
mechleg
Elliot Chen
Matthew Parlette
Florian Ermisch
a.genus
Javier Bértoli
Charles McLaughlin
Carpentier Pierre-Francois
carpenti
Ion Dulgheru
Heinz Wiesinger
Vitali Quiering
Florian Ermisch
Florian Ermisch
risca
Niels Abspoel
Brian Jackson
ek9
Matthew X. Economou
Tobias Martin
Pavel Veretennikov
Furlot
Rene Jochum
Jeff Baskin
John Kristensen
Matt Willsher
Ivan Kadochnikov
Forrest
genuss
Rob Ruma
Marcin Witowski
Daniel Krämer
Jeremy T. Bouse
Krzysztof Pawłowski
Matthew Richardson
Matthew Pherigo
Manoj Sonawane
Raphaël Hertzog
Tiago Teresa Teodósio
Étienne BERSAC
Christian McHugh
Brad Thurber
John Galt
Seth Miller
Imran Iqbal
Thomas Larsen
Kevin Schmidt
Mohammed Naser
James O'Neill
risca
abednarik
Devon Stewart
Wolodja Wentland
puneet kandhari
Shane Poage
Shane Poage
Nitin Madhok
Simon Lloyd
jpic
Marco Orovecchia
Devin Christensen
Petr Demin