From 13ea551011f06f03caab0ba83cf0acc5e928f223 Mon Sep 17 00:00:00 2001 From: Ivan Kadochnikov Date: Fri, 7 Oct 2016 15:55:15 +0300 Subject: [PATCH] Simplify pkgrepo logic, made possible by 3b265a544 --- salt/pkgrepo/absent.sls | 2 +- salt/pkgrepo/init.sls | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/salt/pkgrepo/absent.sls b/salt/pkgrepo/absent.sls index d79b15f..b66c8e3 100644 --- a/salt/pkgrepo/absent.sls +++ b/salt/pkgrepo/absent.sls @@ -1,2 +1,2 @@ include: - - .{{ grains['os']|lower }}.absent + - .{{ grains['os_family']|lower }}.absent diff --git a/salt/pkgrepo/init.sls b/salt/pkgrepo/init.sls index e6eeb3c..b2c794c 100644 --- a/salt/pkgrepo/init.sls +++ b/salt/pkgrepo/init.sls @@ -1,6 +1,2 @@ -{% set name = { - 'RedHat': 'redhat', - 'Debian': grains['os_family']|lower, -}.get(grains.os_family) %} include: - - .{{ name }} + - .{{ grains['os_family']|lower }}