Commit Graph

61 Commits

Author SHA1 Message Date
Imran Iqbal 5146c449d5
fix(oracle-7): use `osmajorrelease` instead of `$releasever`
Avoid this error:

```
      ID: salt-master
Function: pkg.installed
  Result: False
 Comment: Error occurred installing package(s). Additional info follows:

   errors:
       - Running scope as unit run-402.scope.
         Loaded plugins: ovl, ulninfo
         https://repo.saltproject.io/py3/redhat/7Server/x86_64/3002/repodata/repomd.xml:
             [Errno 14] HTTPS Error 404 - Not Found
         Trying other mirror.
         No package salt-master available.
         Error: Nothing to do
```
2021-05-25 21:03:37 +01:00
Imran Iqbal 5b348eb354
fix(map.jinja): fix `salt-lint` errors
```bash
Examining salt/map.jinja of type state
[209] Jinja comment should have spaces before and after: {# comment #}
salt/map.jinja:4
{## Start imports ##}

[209] Jinja comment should have spaces before and after: {# comment #}
salt/map.jinja:21
{## Merge in salt pillar ##}

[209] Jinja comment should have spaces before and after: {# comment #}
salt/map.jinja:24
{## Merge in salt_formulas pillar ##}
```
2019-10-09 18:34:12 +01:00
Imran Iqbal feb09698ce Fix `salt:lookup` regression 2019-01-29 05:38:25 +00:00
Niels Abspoel 66c0699814 fix small issues found by @myii 2019-01-26 11:10:44 +01:00
Niels Abspoel 93682852a7 simplify map.jinja 2019-01-25 21:35:16 +01:00
Raluca Samuilescu 68f8d57e05 Fix `repo.saltstack.com` URLs for pinned minor release (#364)
* All minor releases appear in an `archive` sub-directory.
* Resolves main bug in GitHub issue #364.
* Simplification of original GitHub PR #365 by @ralucasg.
2019-01-25 15:32:03 +00:00
Thor77 ff34b1f8a4
Add missing GitPython-package for Arch 2019-01-05 12:06:54 +01: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
Colin Stubbs 32d9a9467d Add MacOS support; fix Issue #352 (#363)
* Add MacOS support; fix Issue #352

* On MacOS, only attempt download if condition

Add if salt_settings.install_packages to requisites for an attempt to download the minion package on MacOS

* Update example pillar for MacOS support

Describe how to use MacOS specific options

* Add MacOS notes

* Update README.rst

* Update README.rst
2018-04-17 22:26:20 +02:00
Colin Stubbs d40d869883
Add os_family default for gitpython on RedHat
salt.gitfs.gitpython.install_from_source == False on RedHat
Not sure about other O/S'es as to what default value should be
2018-04-01 21:52:29 +10:00
Colin Stubbs 32f3104dbe Missing single quote 2018-01-06 23:22:57 +10:00
Colin Stubbs 4307b8ee65 Add pkg source default options for MacOS 2018-01-06 23:21:15 +10:00
Colin Stubbs 532b306b4e Add initial basis for proper MacOS support 2018-01-06 22:54:57 +10:00
Colin Stubbs 996aa78a8b pillar example is incorrect; map.jinja incorrectly names package for windows 2018-01-06 22:21:02 +10:00
Jorge Schrauwen 71e08ab599
Set correct api_service for SmartOS
On SmartOS the salt-api daemon is started by the salt:api service.
2017-12-23 22:23:53 +01:00
Theo Chatzimichos 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
Theo Chatzimichos 3fd9b0964d add default values for SUSE osfamily (#343) 2017-11-20 23:34:09 +01:00
Gilles Dartiguelongue 3c88ad9918 Add pyinotify entry for Gentoo, refs #331 2017-09-11 14:32:47 +02:00
Niels Abspoel 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
Tibold 80a160a810 Added default pyinotify package name for archlinux. 2017-08-16 07:20:00 +00:00
Tibold e94f15d0fe Added support for installing pynotify when inotify beacons are configuredwq 2017-08-15 20:48:15 +00:00
Niels Abspoel e2973c644d fix iteritems() with items() 2017-08-14 13:15:30 +02:00
Matthew Parlette 4437f7b2e1 Fixed map.jinja to work with 2017.7.0 2017-07-18 16:18:44 -04:00
Carpentier Pierre-Francois 5c3dc73f2a fix map.jinja
add missing comas
2017-05-31 22:53:48 +02:00
carpenti 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
Florian Ermisch 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
Florian Ermisch 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
ek9 d7af7c15bb Alpine Linux: add basic support 2017-01-13 17:31:47 +01:00
ek9 8ae39f4700 Arch Linux: install pygit2 or libgit2 via pacman instead of source by default 2017-01-13 17:03:19 +01:00
Jeff Baskin 0166cd4097 Added fedora. 2016-12-19 23:29:42 -05:00
Brian Jackson d68c0b63ee Merge pull request #267 from fizmat/pkgrepo-cleanup
Pkgrepo cleanup
2016-11-21 22:53:47 -08:00
Matt Willsher 157f356442 Correct SmartOS config path 2016-11-14 22:22:52 +00:00
Matt Willsher 5b87c50e46 Add SmartOS salt-master and gitfs support 2016-11-14 22:13:52 +00:00
Ivan Kadochnikov 8552113226 update map.jinja after Arch renamed the package 2016-11-10 16:05:48 +03:00
Ivan Kadochnikov fd0b200fea Delete repotype from map.jinja, unused after 8f2191471 2016-11-10 11:09:19 +03:00
Daniel Krämer 749bf0e863 [BIGFUX] make pygit2 work with ubuntu xenial 2016-09-13 09:03:06 +02:00
Daniel Krämer a842dbe621 Fixes saltstack-formulas/salt-formula#190 2016-09-05 10:48:31 +02:00
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
2016-08-13 15:29:03 -04:00
Matthew Pherigo 621e1f218c Add support for OpenBSD in map.jinja 2016-07-01 21:25:06 -05:00
Raphaël Hertzog 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
Tiago Teresa Teodósio 6690e8b103 Fixing GitPython package name for RedHat OS family. Tested on CentOS 7. 2016-05-30 13:50:16 +02:00
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`.
2016-03-29 13:36:46 -04:00
Seth Miller c7552b6d0a Add Windows support to map.jinja
This adds some minimal support for Windows minions.
2016-03-22 20:15:44 -05:00
James O'Neill 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
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 ba9cc2605c Use the py27-pygit2 package when installing pygit2 on FreeBSD 2015-07-24 17:06:15 -04:00
Matthew X. Economou ea5a9f1f2c Merge remote-tracking branch 'upstream/master' into fix-freebsd-gitpython-package 2015-07-24 16:53:24 -04:00
Matthew X. Economou b477990830 Use the py27-GitPython package when installing GitPython on FreeBSD. 2015-07-24 16:30:02 -04:00
Matthew X. Economou 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