0
0
mirror of https://github.com/saltstack-formulas/salt-formula.git synced 2024-11-27 22:38:10 +01:00
Commit Graph

40 Commits

Author SHA1 Message Date
Dallas Harris
ca1df1b69e
fix(default): set salt:minion:master_type to str
Having it set as true causes an error with the minion config when the salt-minion starts
2021-09-04 21:27:43 +01:00
Imran Iqbal
bbd7286240
refactor(retry_options): provide options from defaults/pillar 2021-03-30 12:40:40 +01:00
noelmcloughlin
0c591bba95 fix(windows): git.latest(parallel:true) does not work 2020-09-11 22:03:25 +01:00
N
419352f6ce Merge branch 'master' of https://github.com/saltstack-formulas/salt-formula into macos 2020-06-13 20:33:36 +01:00
N
4d901b94d1 Merge branch 'master' into macos 2020-06-01 01:08:54 +01:00
hatifnatt
98ad87a001 feat(package): use apt-pinning to pin specific package version
Available only on Debian family OS-es
2020-03-18 22:49:28 +03:00
Imran Iqbal
10e8778647
Merge pull request #453 from cr1st1p/allow-disable-services
Allow disabling services or just ignoring them.
2020-03-11 07:10:33 +00:00
cristi
29ffd68d34 feat(mapping): better control of the service's state
Instead of the default service.running + enabled, you can control
the actual state, via pillar.
And you can even say 'state = ignore' and no state will be generated
to control the service
2020-02-20 18:44:04 +02:00
N
fbaa456ca6
feat(metastate): add metastate per community convention 2020-02-18 13:34:38 +00:00
N
715e3b8fa4
refactor(mapping): simplify py version handling 2020-01-25 18:06:29 +00:00
N
94027f7332
feat(macos): basic launchctl service support 2020-01-22 15:55:42 +00:00
Imran Iqbal
ebfeba2c4f
feat: use semantic-release cross-formula standard structure
* Semi-automated using https://github.com/myii/ssf-formula/pull/31
* Includes:
  - Update TOFS
  - Use `bin/kitchen`
  - Use `dist: bionic` in Travis
  - Add `yamllint` and apply rules
  - Use `pillars_from_files` throughout
  - Replace EOL images in Kitchen & Travis
  - Add `develop` images in Kitchen & Travis
* Fix (or ignore)  errors shown below:

```bash
salt-formula$ yamllint -s .
./pillar.example
  1:1       warning  missing document start "---"  (document-start)
  5:23      warning  truthy value should be one of [false, true]  (truthy)
  8:25      warning  truthy value should be one of [false, true]  (truthy)
  11:25     warning  truthy value should be one of [false, true]  (truthy)
  19:21     warning  truthy value should be one of [false, true]  (truthy)
  40:89     error    line too long (108 > 88 characters)  (line-length)
  41:89     error    line too long (112 > 88 characters)  (line-length)
  43:89     error    line too long (112 > 88 characters)  (line-length)
  45:89     error    line too long (110 > 88 characters)  (line-length)
  47:89     error    line too long (89 > 88 characters)  (line-length)
  74:27     warning  truthy value should be one of [false, true]  (truthy)
  82:9      error    wrong indentation: expected 10 but found 8  (indentation)
  101:14    warning  truthy value should be one of [false, true]  (truthy)
  102:20    warning  truthy value should be one of [false, true]  (truthy)
  103:89    error    line too long (119 > 88 characters)  (line-length)
  121:7     warning  comment not indented like content  (comments-indentation)
  122:24    error    syntax error: found character '%' that cannot start any token
  310:89    error    line too long (102 > 88 characters)  (line-length)
  330:89    error    line too long (113 > 88 characters)  (line-length)
  433:1     error    too many blank lines (1 > 0)  (empty-lines)

./salt/osmap.yaml
  4:2       error    syntax error: found character '%' that cannot start any token
  6:89      error    line too long (93 > 88 characters)  (line-length)
  22:89     error    line too long (137 > 88 characters)  (line-length)
  23:89     error    line too long (134 > 88 characters)  (line-length)
  33:89     error    line too long (149 > 88 characters)  (line-length)
  34:89     error    line too long (146 > 88 characters)  (line-length)

./salt/osfamilymap.yaml
  4:2       error    syntax error: found character '%' that cannot start any token
  6:89      error    line too long (94 > 88 characters)  (line-length)
  24:89     error    line too long (149 > 88 characters)  (line-length)
  25:89     error    line too long (146 > 88 characters)  (line-length)
  39:89     error    line too long (105 > 88 characters)  (line-length)
  40:89     error    line too long (127 > 88 characters)  (line-length)
  56:89     error    line too long (101 > 88 characters)  (line-length)

./salt/ospyvermap.yaml
  4:1       warning  missing document start "---"  (document-start)

./salt/defaults.yaml
  3:1       warning  missing document start "---"  (document-start)
  7:21      warning  truthy value should be one of [false, true]  (truthy)
  8:12      warning  truthy value should be one of [false, true]  (truthy)
  9:23      warning  truthy value should be one of [false, true]  (truthy)
  10:19     warning  truthy value should be one of [false, true]  (truthy)
  14:25     warning  truthy value should be one of [false, true]  (truthy)
  15:25     warning  truthy value should be one of [false, true]  (truthy)
  16:27     warning  truthy value should be one of [false, true]  (truthy)
  17:27     warning  truthy value should be one of [false, true]  (truthy)
  39:28     warning  truthy value should be one of [false, true]  (truthy)
  41:28     warning  truthy value should be one of [false, true]  (truthy)
  45:24     warning  truthy value should be one of [false, true]  (truthy)
  49:30     warning  truthy value should be one of [false, true]  (truthy)
  54:28     warning  truthy value should be one of [false, true]  (truthy)
  63:25     warning  truthy value should be one of [false, true]  (truthy)
  68:15     warning  truthy value should be one of [false, true]  (truthy)
```
2019-09-13 07:58:18 +01:00
N
beb0e85b04
fix(perms): some os have custom user/root 2019-08-01 13:13:27 +01:00
N
14276e2074
fix(macos): fix minion package handling for homebrew 2019-08-01 01:31:02 +01:00
Imran Iqbal
fbe814ace8
feat(tofs): allow TOFS for minion configuration 2019-06-07 03:58:24 +01:00
Imran Iqbal
1b202afb29
feat(tofs): allow TOFS for master configuration 2019-06-07 03:58:24 +01:00
N
322dc97763
shutup cmd.run (its debug by default) 2018-12-18 21:50:37 +00:00
N
5570b6c072
Move some defaults from pillar.example to defaults 2018-12-18 21:42:28 +00:00
myii
91b666c75f Improve limitations related to git.latest in salt.formulas (#239)
* Ensure options for formulas `git.latest` are also based on defaults

* Prevent erroneous remote tracking branch modification by `salt.formulas` #238

* Allow multiple envs to use the same gitdir for `salt.formulas`

* Ensure `gitdir` original branch is checked out after formulas `git.latest`

* Fix erroneous comment re: merging in `salt` pillar
2018-06-10 11:18:20 +02:00
a.genus
22ad7db7c0 Add restart minion via at (fixes #136) 2017-06-14 19:28:11 +03:00
Matt Willsher
5b87c50e46 Add SmartOS salt-master and gitfs support 2016-11-14 22:13:52 +00:00
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.
2016-09-21 17:01:37 +10:00
Rene Jochum
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
Rene Jochum
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
Shane Poage
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
Shane Poage
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
Matthew X. Economou
85a426ccdf Add new salt:python_git key.
This key defaults to a value of `python-git`.
2015-07-24 16:27:52 -04:00
Brian Jackson
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
Brian Jackson
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
Brian Jackson
ed3ab22a13 Revert "Add support for GitPython and salt-ssh on FreeBSD masters"
This reverts commit b03831c0b0.
2015-07-20 17:05:56 -05:00
Matthew X. Economou
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
René Jochum
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
René Jochum
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
puneet kandhari
145b58a9d3 Remove Duplicates from defaults.yaml and map.jinja 2015-05-26 13:28:17 -05:00
Andrew Vant
f3ed6e1828 cloud.providers.d can now be redirected.
This obsoletes the salt☁️folders and salt☁️providers pillar
entries. Provider keys have been moved to /etc/salt/pki/cloud.
2015-04-03 19:30:26 -04:00
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.
2015-03-27 17:58:05 -05:00
Brian Jackson
4533cc7d0e Add modules to install gitfs backend dependencies
Add modules for gitfs dependencies and documentation for how to use them.
2015-03-25 21:52:29 -05:00
Brian Jackson
924c04c0d8 Add setting to not install packages
If you are installing Salt via git/pip, the formula will try to overwrite your
install with packaged versions. This setting makes it possible to avoid that.
2015-03-24 12:08:08 -05:00
Brian Jackson
8ebb7f57df Stop using clean: True on /etc/salt/{minion,master}.d
New versions of Salt put config files in /etc/salt/{minion,master}.d. We don't
want to erase them by using a clean: True on the file.recurse. This is a
backward incompatible change, but it's necessary to avoid deleting Salt config
files.

Resolves #104
2015-03-24 10:46:25 -05:00
Brian Jackson
cb3aa80c62 Don't overwrite salt variable
Using a variable named salt is a bad idea when salt already has a variable
named salt.
2015-03-16 23:39:32 -05:00