updated repo state

README.md

@@ -90,7 +90,7 @@ states
 ├── rclone
 ├── reactor
 ├── redis
-├── repos
+├── repo
 ├── rspamd
 ├── rsync
 ├── rsyslog

states/repo/defaults.yaml

@@ -0,0 +1,2 @@
+---
+repo: {}

states/repo/install.sls

@@ -1,6 +1,6 @@
 ---
-{%- from "repos/map.jinja" import repos with context %}
+{%- from "repo/map.jinja" import repo with context %}
-{%- for name,repo in repos.items() %}
+{%- for name,repo in repo.items() %}
 
 {%- if repo.enabled %}
 {%- if repo.key_method is defined %}

states/repo/map.jinja

@@ -0,0 +1,5 @@
+{%- import_yaml "repo/defaults.yaml" as default_settings -%}
+
+{%- set defaults = salt['grains.filter_by'](default_settings, default='repo') -%}
+
+{%- set repo = salt['pillar.get']('repo', default=defaults, merge=True) -%}

states/repos/defaults.yaml

@@ -1,2 +0,0 @@
----
-repos: {}

states/repos/map.jinja

@@ -1,5 +0,0 @@
-{%- import_yaml "repos/defaults.yaml" as default_settings -%}
-
-{%- set defaults = salt['grains.filter_by'](default_settings, default='repos') -%}
-
-{%- set repos = salt['pillar.get']('repos', default=defaults, merge=True) -%}