Merge pull request #267 from fizmat/pkgrepo-cleanup

Pkgrepo cleanup

salt/map.jinja

@@ -71,7 +71,6 @@ that differ from whats in defaults.yaml
       'master': {
         'gitfs_provider': 'pygit2'
       },
-      'repotype': 'epel',
     },
     'Suse':    {},
     'Gentoo':  {

salt/pkgrepo/absent.sls

@@ -1,2 +1,2 @@
 include:
-  - .{{ grains['os']|lower }}.absent
+  - .{{ grains['os_family']|lower }}.absent

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 }}

salt/pkgrepo/ubuntu/absent.sls

@@ -1,5 +0,0 @@
-drop-saltstack-pkgrepo:
-  pkgrepo.absent:
-    - name: deb http://repo.saltstack.com/apt/ubuntu/{{ grains['lsb_distrib_release'] }}/amd64/latest {{ grains['lsb_distrib_codename'] }} main
-    - file: /etc/apt/sources.list.d/saltstack.list
-    - key_url: https://repo.saltstack.com/apt/ubuntu/{{ grains['lsb_distrib_release'] }}/amd64/latest/SALTSTACK-GPG-KEY.pub

salt/pkgrepo/ubuntu/init.sls

@@ -1,5 +0,0 @@
-saltstack-pkgrepo:
-  pkgrepo.managed:
-    - name: deb https://repo.saltstack.com/apt/ubuntu/{{ grains['lsb_distrib_release'] }}/amd64/latest {{ grains['lsb_distrib_codename'] }} main
-    - file: /etc/apt/sources.list.d/saltstack.list
-    - key_url: https://repo.saltstack.com/apt/ubuntu/{{ grains['lsb_distrib_release'] }}/amd64/latest/SALTSTACK-GPG-KEY.pub