fix(clean): make repo install and clean states consistent

Author: danny-smit

docker/software/package/clean.sls

@@ -6,17 +6,19 @@
 {%- set formula = d.formula %}
 
     {%- if d.pkg.docker.use_upstream in ('package', 'repo') %}
-        {%- if grains.kernel|lower in ('linux',) %}
-            {%- if d.pkg.docker.use_upstream == 'repo' %}
+        {%- set enable_repo = d.pkg.docker.use_upstream == 'repo' and grains.os_family in ('RedHat', 'Debian') %}
+        {%- if enable_repo %}
+            {%- set sls_repo_clean = tplroot ~ '.software.package.repo.clean' %}
 include:
-  - .repo.clean
-            {%- endif %}
+  - {{ sls_repo_clean }}
+        {%- endif %}
 
+        {%- if grains.kernel|lower in ('linux', 'darwin') %}
 {{ formula }}-software-package-clean-pkg:
   pkg.removed:
     - name: {{ d.pkg.docker.name }}
     - reload_modules: {{ d.misc.reload|default(true, true) }}
-            {%- if d.pkg.docker.use_upstream == 'repo' %}
+            {%- if enable_repo %}
     - require:
       - pkgrepo: {{ formula }}-software-package-repo-absent
             {%- endif %}

docker/software/package/install.sls

@@ -6,13 +6,14 @@
 {%- set formula = d.formula %}
 
     {%- if d.pkg.docker.use_upstream in ('package', 'repo') %}
+        {%- set enable_repo = d.pkg.docker.use_upstream == 'repo' and grains.os_family in ('RedHat', 'Debian') %}
         {%- set docker_pkg_version = d.version | default(d.pkg.version, true) %}
-        {%- if grains.os_family in ('RedHat', 'Debian') %}
+        {%- if enable_repo %}
             {%- set sls_repo_install = tplroot ~ '.software.package.repo.install' %}
-
 include:
   - {{ sls_repo_install }}
         {%- endif %}
+
         {%- if grains.kernel|lower in ('linux', 'darwin') %}
             {%- if 'deps' in d.pkg and d.pkg.deps %}
 
@@ -43,7 +44,7 @@ include:
             {%- if grains.os|lower not in ('suse',) %}
     - hold: {{ d.misc.hold|default(false, true) }}
             {%- endif %}
-            {%- if grains.os_family in ('RedHat', 'Debian') %}
+            {%- if enable_repo %}
     - require:
       - pkgrepo: {{ formula }}-software-package-repo-managed
             {%- endif %}

docker/software/package/repo/clean.sls

@@ -5,8 +5,12 @@
 {%- from tplroot ~ "/map.jinja" import data as d with context %}
 {%- set formula = d.formula %}
 
+    {%- if 'repo' in d.pkg.docker and d.pkg.docker.repo %}
+
 {{ formula }}-software-package-repo-absent:
   pkgrepo.absent:
     - name: {{ d.pkg.docker.repo.name }}
     - onlyif:
       - {{ d.pkg.docker.repo }}
+
+    {%- endif %}