瀏覽代碼

fix(pkgrepo): provide settings for `amazon`

tags/v0.59.1
Imran Iqbal 5 年之前
父節點
當前提交
cb726afb10
沒有連結到貢獻者的電子郵件帳戶。
共有 3 個檔案被更改,包括 17 行新增5 行删除
  1. +2
    -0
      salt/osfamilymap.yaml
  2. +6
    -0
      salt/osmap.yaml
  3. +9
    -5
      salt/pkgrepo/redhat/install.sls

+ 2
- 0
salt/osfamilymap.yaml 查看文件

@@ -41,6 +41,8 @@ Debian:
install_from_source: false

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 }}'
key_url: 'https://repo.saltstack.com/{{ py_ver_repr }}/redhat/$releasever/$basearch/{{ salt_release }}/SALTSTACK-GPG-KEY.pub'
pygit2: python-pygit2

+ 6
- 0
salt/osmap.yaml 查看文件

@@ -19,6 +19,12 @@
Fedora:
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:
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'

+ 9
- 5
salt/pkgrepo/redhat/install.sls 查看文件

@@ -1,14 +1,18 @@
# -*- coding: utf-8 -*-
# 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:
pkgrepo.managed:
- name: saltstack
- humanname: SaltStack repo for RHEL/CentOS $releasever
- name: {{ salt_settings.pkgrepo_name }}
- humanname: {{ salt_settings.pkgrepo_humanname }}
- baseurl: {{ salt_settings.pkgrepo }}
- enabled: 1
- gpgcheck: 1
- gpgkey: {{ salt_settings.key_url }}
{% endif %}
{%- if grains['os']|lower in ['amazon'] %}
- failovermethod: priority
- priority: 10
{%- endif %}
{%- endif %}

Loading…
取消
儲存