saltstack-formulas/salt-formula
Template
2
0
Fork 0
Code Releases Activity

refactor(linux): align to template-formula (plus fixes)

Browse Source
This commit is contained in:
N 2019-07-29 23:26:08 +01:00
parent 6a312544dd
commit 71b4d8abb8
No known key found for this signature in database
GPG Key ID: 55A292EAB4E54067
13 changed files with 83 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
docs/README.rst
View File

@ -107,13 +107,12 @@ For EL distributions, pygit is installed from packages from `EPEL <https://githu
``salt.pkgrepo``
^^^^^^^^^^^^^^^^
Enable the official saltstack package repository in order to always
benefit from the latest version. This state currently only works on Debian, Ubuntu, RHEL 6/7 and aims to implement the `installation recommendations of the official documentation <http://docs.saltstack.com/en/latest/topics/installation/index.html#platform-specific-installation-instructions>`_.
It is recommended to use SaltStack repository for Debian, RedHat, and SuSE, to benefit from the latest stable salt release. Refer to official documentation at <http://docs.saltstack.com/en/latest/topics/installation/index.html#platform-specific-installation-instructions>`_.
``salt.pkgrepo.absent``
``salt.pkgrepo.clean``
^^^^^^^^^^^^^^^^^^^^^^^
Undo the effects of ``salt.pkgrepo``.
Undo the effects of ``salt.pkgrepo`` on Debian, RedHat, and SuSE.
``salt.formulas``
^^^^^^^^^^^^^^^^^

11
salt/pkgrepo/debian/absent.sls
View File

@ -1,11 +0,0 @@
{% from "salt/map.jinja" import salt_settings with context %}
drop-saltstack-pkgrepo:
pkgrepo.absent:
- name: {{ salt_settings.pkgrepo }}
file.absent:
- name: /etc/apt/sources.list.d/saltstack.list
drop-saltstack-apt-key:
file.absent:
- name: /etc/apt/trusted.gpg.d/saltstack.gpg

1
salt/pkgrepo/debian/absent.sls Symbolic link
View File

@ -0,0 +1 @@
clean.sls

13
salt/pkgrepo/debian/clean.sls Normal file
View File

@ -0,0 +1,13 @@
# -*- coding: utf-8 -*-
# vim: ft=sls
{% from "salt/map.jinja" import salt_settings with context %}
salt-pkgrepo-clean-saltstack-debian:
pkgrepo.absent:
- name: {{ salt_settings.pkgrepo }}
file.absent:
- name: /etc/apt/sources.list.d/saltstack.list
salt-pkgrepo-clean-saltstack-debian-apt-key:
file.absent:
- name: /etc/apt/trusted.gpg.d/saltstack.gpg

15
salt/pkgrepo/debian/init.sls
View File

@ -1,12 +1,5 @@
{% from "salt/map.jinja" import salt_settings with context %}
# -*- coding: utf-8 -*-
# vim: ft=sls
saltstack-pkgrepo:
pkgrepo.managed:
- humanname: SaltStack Debian Repo
- name: {{ salt_settings.pkgrepo }}
- file: /etc/apt/sources.list.d/saltstack.list
- key_url: {{ salt_settings.key_url }}
- clean_file: True
# Order: 1 because we can't put a require_in on "pkg: salt-{master,minion}"
# because we don't know if they are used.
- order: 1
include:
- .install

14
salt/pkgrepo/debian/install.sls Normal file
View File

@ -0,0 +1,14 @@
# -*- coding: utf-8 -*-
# vim: ft=sls
{% from "salt/map.jinja" import salt_settings with context %}
salt-pkgrepo-install-saltstack-debian:
pkgrepo.managed:
- humanname: SaltStack Debian Repo
- name: {{ salt_settings.pkgrepo }}
- file: /etc/apt/sources.list.d/saltstack.list
- key_url: {{ salt_settings.key_url }}
- clean_file: True
# Order: 1 because we can't put a require_in on "pkg: salt-{master,minion}"
# because we don't know if they are used.
- order: 1

3
salt/pkgrepo/redhat/absent.sls
View File

@ -1,3 +0,0 @@
drop-saltstack-pkgrepo:
pkgrepo.absent:
- name: saltstack-pkgrepo

1
salt/pkgrepo/redhat/absent.sls Symbolic link
View File

@ -0,0 +1 @@
clean.sls

6
salt/pkgrepo/redhat/clean.sls Normal file
View File

@ -0,0 +1,6 @@
# -*- coding: utf-8 -*-
# vim: ft=sls
salt-pkgrepo-clean-saltstack-redhat:
pkgrepo.absent:
- name: saltstack

15
salt/pkgrepo/redhat/init.sls
View File

@ -1,12 +1,5 @@
{% from "salt/map.jinja" import salt_settings with context %}
# -*- coding: utf-8 -*-
# vim: ft=sls
{%- if grains['os']|lower not in ('amazon', 'fedora') %}
saltstack-pkgrepo:
pkgrepo.managed:
- name: saltstack
- humanname: SaltStack repo for RHEL/CentOS $releasever
- baseurl: {{ salt_settings.pkgrepo }}
- enabled: 1
- gpgcheck: 1
- gpgkey: {{ salt_settings.key_url }}
{% endif %}
include:
- .install

14
salt/pkgrepo/redhat/install.sls Normal file
View File

@ -0,0 +1,14 @@
# -*- coding: utf-8 -*-
# vim: ft=sls
{% from "salt/map.jinja" import salt_settings with context %}
{%- if grains['os']|lower not in ('amazon', 'fedora') %}
salt-pkgrepo-install-saltstack-redhat:
pkgrepo.managed:
- name: saltstack
- humanname: SaltStack repo for RHEL/CentOS $releasever
- baseurl: {{ salt_settings.pkgrepo }}
- enabled: 1
- gpgcheck: 1
- gpgkey: {{ salt_settings.key_url }}
{% endif %}

3
salt/pkgrepo/suse/absent.sls
View File

@ -1,3 +0,0 @@
drop-saltstack-pkgrepo:
pkgrepo.absent:
- name: saltstack-pkgrepo

1
salt/pkgrepo/suse/absent.sls Symbolic link
View File

@ -0,0 +1 @@
clean.sls

6
salt/pkgrepo/suse/clean.sls Normal file
View File

@ -0,0 +1,6 @@
# -*- coding: utf-8 -*-
# vim: ft=sls
salt-pkgrepo-clean-saltstack-suse:
pkgrepo.absent:
- name: systemsmanagement_saltstack_products

13
salt/pkgrepo/suse/init.sls
View File

@ -1,10 +1,5 @@
{% from "salt/map.jinja" import salt_settings with context %}
# -*- coding: utf-8 -*-
# vim: ft=sls
saltstack-pkgrepo:
pkgrepo.managed:
- name: systemsmanagement_saltstack_products
- humanname: SaltStack repo for Opensuse 42.3
- baseurl: {{ salt_settings.pkgrepo }}
- enabled: 1
- gpgcheck: 1
- gpgkey: {{ salt_settings.key_url }}
include:
- .install

12
salt/pkgrepo/suse/install.sls Normal file
View File

@ -0,0 +1,12 @@
# -*- coding: utf-8 -*-
# vim: ft=sls
{% from "salt/map.jinja" import salt_settings with context %}
salt-pkgrepo-install-saltstack-suse:
pkgrepo.managed:
- name: systemsmanagement_saltstack_products
- humanname: SaltStack repo for Opensuse 42.3
- baseurl: {{ salt_settings.pkgrepo }}
- enabled: 1
- gpgcheck: 1
- gpgkey: {{ salt_settings.key_url }}