瀏覽代碼

ci(kitchen): workaround epel dependancy

pull/229/head
Pascal de Bruijn 2 年之前
父節點
當前提交
a641d21b15
共有 2 個檔案被更改,包括 14 行新增6 行删除
  1. +14
    -0
      users/googleauth.sls
  2. +0
    -6
      users/init.sls

+ 14
- 0
users/googleauth.sls 查看文件

@@ -2,6 +2,20 @@
{%- from "users/map.jinja" import users with context %}

{%- if not grains['os_family'] in ['Suse'] %}
{%- if salt['grains.get']('osfinger', '') in ['Amazon Linux-2'] %}
users_epel_repo:
pkgrepo.managed:
- name: epel
- humanname: Extra Packages for Enterprise Linux 7 - $basearch
- mirrorlist: https://mirrors.fedoraproject.org/metalink?repo=epel-7&arch=$basearch
- enabled: 1
- gpgcheck: 1
- gpgkey: https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7
- failovermethod: priority
- require_in:
- pkg: users_googleauth-package
{%- endif %}

users_googleauth-package:
pkg.installed:
- name: {{ users.googleauth_package }}

+ 0
- 6
users/init.sls 查看文件

@@ -50,9 +50,6 @@ include:
- users.sudo
{%- endif %}
{%- if used_googleauth %}
{%- if grains['os_family'] == 'RedHat' %}
- epel
{%- endif %}
- users.googleauth
{%- endif %}
{%- if used_user_files %}
@@ -521,9 +518,6 @@ users_googleauth-{{ svc }}-{{ name }}:
- group: {{ users.root_group }}
- mode: '0600'
- require:
{%- if grains['os_family'] == 'RedHat' %}
- pkg: epel_release
{%- endif %}
- pkg: users_googleauth-package
{%- endfor %}
{%- endif %}

Loading…
取消
儲存