ci(kitchen): workaround epel dependancy

saltstack-formulas · Jun 14, 2022 · a641d21 · a641d21
1 parent 63dd7c8
commit a641d21
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/users/googleauth.sls b/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 }}

diff --git a/users/init.sls b/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 %}