2
0

fix(pkgrepo): provide settings for amazon

This commit is contained in:
Imran Iqbal 2019-09-19 00:19:26 +01:00
parent f00c9a796a
commit cb726afb10
No known key found for this signature in database
GPG Key ID: 6D8629439D2B7819
3 changed files with 17 additions and 5 deletions

View File

@ -41,6 +41,8 @@ Debian:
install_from_source: false install_from_source: false
RedHat: RedHat:
pkgrepo_name: saltstack
pkgrepo_humanname: SaltStack repo for RHEL/CentOS $releasever
pkgrepo: 'https://repo.saltstack.com/{{ py_ver_repr }}/redhat/$releasever/$basearch/{{ salt_release }}' pkgrepo: 'https://repo.saltstack.com/{{ py_ver_repr }}/redhat/$releasever/$basearch/{{ salt_release }}'
key_url: 'https://repo.saltstack.com/{{ py_ver_repr }}/redhat/$releasever/$basearch/{{ salt_release }}/SALTSTACK-GPG-KEY.pub' key_url: 'https://repo.saltstack.com/{{ py_ver_repr }}/redhat/$releasever/$basearch/{{ salt_release }}/SALTSTACK-GPG-KEY.pub'
pygit2: python-pygit2 pygit2: python-pygit2

View File

@ -19,6 +19,12 @@
Fedora: Fedora:
pygit2: python2-pygit2 pygit2: python2-pygit2
Amazon:
pkgrepo_name: saltstack-amzn-repo
pkgrepo_humanname: SaltStack repo for Amazon Linux 2
pkgrepo: 'https://repo.saltstack.com/yum/amazon/2/$basearch/{{ salt_release }}'
key_url: 'https://repo.saltstack.com/yum/amazon/2/$basearch/{{ salt_release }}/SALTSTACK-GPG-KEY.pub'
Ubuntu: Ubuntu:
pkgrepo: 'deb http://repo.saltstack.com/{{ py_ver_dir }}/{{ os_lower }}/{{ osrelease }}/amd64/{{ salt_release }} {{ oscodename }} main' pkgrepo: 'deb http://repo.saltstack.com/{{ py_ver_dir }}/{{ os_lower }}/{{ osrelease }}/amd64/{{ salt_release }} {{ oscodename }} main'
key_url: 'https://repo.saltstack.com/{{ py_ver_dir }}/{{ os_lower }}/{{ osrelease }}/amd64/{{ salt_release }}/SALTSTACK-GPG-KEY.pub' key_url: 'https://repo.saltstack.com/{{ py_ver_dir }}/{{ os_lower }}/{{ osrelease }}/amd64/{{ salt_release }}/SALTSTACK-GPG-KEY.pub'

View File

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