Fix/Feature: RHEL repo.enabled=False; use pkgrepo.abset
Change-Id: I811cbb17d98df357c4b44bd53ddcc5d01a06537f
diff --git a/linux/system/repo.sls b/linux/system/repo.sls
index 1ea921c..aa646ef 100644
--- a/linux/system/repo.sls
+++ b/linux/system/repo.sls
@@ -108,7 +108,7 @@
{%- if repo.ppa is defined %}
- ppa: {{ repo.ppa }}
{%- else %}
- - human_name: {{ name }}
+ - humanname: {{ name }}
- name: {{ repo.source }}
{%- if repo.architectures is defined %}
- architectures: {{ repo.architectures }}
@@ -143,6 +143,19 @@
{%- else %}
linux_repo_{{ name }}_absent:
+ pkgrepo.absent:
+ {%- if repo.ppa is defined %}
+ - ppa: {{ repo.ppa }}
+ {%- if repo.key_id is defined %}
+ - keyid_ppa: {{ repo.keyid_ppa }}
+ {%- endif %}
+ {%- else %}
+ - name: {{ repo.source }}
+ - file: /etc/apt/sources.list.d/{{ name }}.list
+ {%- if repo.key_id is defined %}
+ - keyid: {{ repo.key_id }}
+ {%- endif %}
+ {%- endif %}
file.absent:
- name: /etc/apt/sources.list.d/{{ name }}.list
@@ -150,17 +163,19 @@
{%- endif %}
+{#- os_family Debian #}
{%- endif %}
{%- if grains.os_family == "RedHat" %}
+{%- if repo.get('enabled', True) %}
+
{%- if repo.get('proxy', {}).get('enabled', False) %}
# PLACEHOLDER
# TODO, implement per proxy configuration for Yum
{%- endif %}
{%- if not repo.get('default', False) %}
-
linux_repo_{{ name }}:
pkgrepo.managed:
- name: {{ name }}
@@ -176,11 +191,18 @@
{%- endif %}
- require:
- pkg: linux_repo_prereq_pkgs
-
{%- endif %}
+{#- repo.enabled is false #}
+{%- else %}
+ pkgrepo.absent:
+ - name: {{ repo.source }}
{%- endif %}
+{#- os_family Redhat #}
+{%- endif %}
+
+{#- repo.iteritems() loop #}
{%- endfor %}
{%- if default_repos|length > 0 and grains.os_family == 'Debian' %}