ci(kitchen): workaround epel dependancy
This commit is contained in:
parent
63dd7c88be
commit
a641d21b15
|
@ -2,6 +2,20 @@
|
||||||
{%- from "users/map.jinja" import users with context %}
|
{%- from "users/map.jinja" import users with context %}
|
||||||
|
|
||||||
{%- if not grains['os_family'] in ['Suse'] %}
|
{%- 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:
|
users_googleauth-package:
|
||||||
pkg.installed:
|
pkg.installed:
|
||||||
- name: {{ users.googleauth_package }}
|
- name: {{ users.googleauth_package }}
|
||||||
|
|
|
@ -50,9 +50,6 @@ include:
|
||||||
- users.sudo
|
- users.sudo
|
||||||
{%- endif %}
|
{%- endif %}
|
||||||
{%- if used_googleauth %}
|
{%- if used_googleauth %}
|
||||||
{%- if grains['os_family'] == 'RedHat' %}
|
|
||||||
- epel
|
|
||||||
{%- endif %}
|
|
||||||
- users.googleauth
|
- users.googleauth
|
||||||
{%- endif %}
|
{%- endif %}
|
||||||
{%- if used_user_files %}
|
{%- if used_user_files %}
|
||||||
|
@ -521,9 +518,6 @@ users_googleauth-{{ svc }}-{{ name }}:
|
||||||
- group: {{ users.root_group }}
|
- group: {{ users.root_group }}
|
||||||
- mode: '0600'
|
- mode: '0600'
|
||||||
- require:
|
- require:
|
||||||
{%- if grains['os_family'] == 'RedHat' %}
|
|
||||||
- pkg: epel_release
|
|
||||||
{%- endif %}
|
|
||||||
- pkg: users_googleauth-package
|
- pkg: users_googleauth-package
|
||||||
{%- endfor %}
|
{%- endfor %}
|
||||||
{%- endif %}
|
{%- endif %}
|
||||||
|
|
Loading…
Reference in New Issue