Skip to content

Commit a641d21

Browse files
committed
ci(kitchen): workaround epel dependancy
1 parent 63dd7c8 commit a641d21

2 files changed

Lines changed: 14 additions & 6 deletions

File tree

users/googleauth.sls

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,20 @@
22
{%- from "users/map.jinja" import users with context %}
33
44
{%- if not grains['os_family'] in ['Suse'] %}
5+
{%- if salt['grains.get']('osfinger', '') in ['Amazon Linux-2'] %}
6+
users_epel_repo:
7+
pkgrepo.managed:
8+
- name: epel
9+
- humanname: Extra Packages for Enterprise Linux 7 - $basearch
10+
- mirrorlist: https://mirrors.fedoraproject.org/metalink?repo=epel-7&arch=$basearch
11+
- enabled: 1
12+
- gpgcheck: 1
13+
- gpgkey: https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7
14+
- failovermethod: priority
15+
- require_in:
16+
- pkg: users_googleauth-package
17+
{%- endif %}
18+
519
users_googleauth-package:
620
pkg.installed:
721
- name: {{ users.googleauth_package }}

users/init.sls

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,6 @@ include:
5050
- users.sudo
5151
{%- endif %}
5252
{%- if used_googleauth %}
53-
{%- if grains['os_family'] == 'RedHat' %}
54-
- epel
55-
{%- endif %}
5653
- users.googleauth
5754
{%- endif %}
5855
{%- if used_user_files %}
@@ -521,9 +518,6 @@ users_googleauth-{{ svc }}-{{ name }}:
521518
- group: {{ users.root_group }}
522519
- mode: '0600'
523520
- require:
524-
{%- if grains['os_family'] == 'RedHat' %}
525-
- pkg: epel_release
526-
{%- endif %}
527521
- pkg: users_googleauth-package
528522
{%- endfor %}
529523
{%- endif %}

0 commit comments

Comments
 (0)