fix(ng): fix config for Fedora 30 & 31

saltstack-formulas · Nov 25, 2019 · 9ddbcd5 · 9ddbcd5
1 parent e593d92
commit 9ddbcd5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/varnish/ng/map.jinja b/varnish/ng/map.jinja
@@ -16,6 +16,8 @@
         'config': salt['grains.filter_by']({
             '6': '/etc/sysconfig/varnish',
             '7': '/etc/varnish/varnish.params',
+            '30': '/etc/varnish/varnish.params',
+            '31': '/etc/varnish/varnish.params',
         }, grain='osmajorrelease'),
         'repo': 'varnish40',
     },

diff --git a/varnish/ng/repo.sls b/varnish/ng/repo.sls
@@ -39,17 +39,21 @@ varnish.repo.{{ varnish_settings.repo }}_src:
 
 {% elif salt['grains.get']('os_family') == 'RedHat' %}
 
+{%   if salt['grains.get']('osfinger', '') not in ['Fedora-31'] %}
 varnish.repo.dependencies:
     pkg.installed:
         - pkgs:
+            {% if salt['grains.get']('osfinger', '') not in ['Fedora-30'] %}
             - pygpgme
+            {% endif %}
             - yum-utils
         - require_in:
             {% if salt['grains.get']('osfinger', '') in ['CentOS Linux-7', 'Amazon Linux-2'] %}
             - pkgrepo: varnish_epel_repo
             {% endif %}
             - pkgrepo: varnish.repo.{{ varnish_settings.repo }}
             - pkgrepo: varnish.repo.{{ varnish_settings.repo }}_source
+{%   endif %}
 
 {%   if salt['grains.get']('osfinger', '') in ['CentOS Linux-7', 'Amazon Linux-2'] %}
 varnish_epel_repo: