fix(debian): remove repository using file instead of pkgrepo

A temporary fix for [this issue](saltstack/salt#61602)
netmanagers · Feb 8, 2022 · 28ea2f9 · 28ea2f9
1 parent db49eba
commit 28ea2f9
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 8 deletions.
diff --git a/docker/compose/software/package/clean.sls b/docker/compose/software/package/clean.sls
@@ -7,6 +7,8 @@
     {%- if d.pkg.compose.use_upstream in ('package', 'repo') %}
         {%- if grains.os_family|lower in ('redhat', 'debian') %}
             {%- set sls_repo_clean = tplroot ~ '.software.package.repo.clean' %}
+            {%- set resource_repo_clean = 'file' if grains.os_family == 'Debian' else 'pkgrepo' %}
+
 include:
   - {{ sls_repo_clean }}
         {%- endif %}
@@ -17,7 +19,7 @@ docker-compose-package-clean-pkgs:
     - reload_modules: true
         {%- if grains.os_family|lower in ('redhat', 'debian') %}
     - require:
-      - pkgrepo: docker-software-package-repo-absent
+      - {{ resource_repo_clean }}: docker-software-package-repo-absent
         {%- endif %}
 
     {%- endif %}
diff --git a/docker/osfamilymap.yaml b/docker/osfamilymap.yaml
@@ -41,13 +41,13 @@ Debian:
       - git
       - procps
     docker:
+          {%- if 'oscodename' in grains %}
       {%- set repo_keyring = '/usr/share/keyrings/docker-archive-keyring.gpg' %}
       repo:
-                {%- if 'oscodename' in grains %}
-        name: 'deb [signed-by={{ repo_keyring }} arch=amd64] https://download.docker.com/linux/{{ grains.os|lower }} {{ grains.oscodename }} stable'
-                {%- endif %}
+        name: deb [signed-by={{ repo_keyring }} arch=amd64] https://download.docker.com/linux/{{ grains.os|lower }} {{ grains.oscodename }} stable
         file: /etc/apt/sources.list.d/docker.list
       repo_keyring: {{ repo_keyring }}
+          {%- endif %}
 
 RedHat:
   pkg:

diff --git a/docker/software/package/clean.sls b/docker/software/package/clean.sls
@@ -8,6 +8,7 @@
         {%- set enable_repo = grains.os_family in ('RedHat', 'Debian') and d.pkg.docker.get('repo') %}
         {%- if enable_repo %}
             {%- set sls_repo_clean = tplroot ~ '.software.package.repo.clean' %}
+            {%- set resource_repo_clean = 'file' if grains.os_family == 'Debian' else 'pkgrepo' %}
 include:
   - {{ sls_repo_clean }}
         {%- endif %}
@@ -21,7 +22,7 @@ docker-software-package-clean-pkg:
     - reload_modules: {{ d.misc.reload|default(true, true) }}
             {%- if enable_repo %}
     - require:
-      - pkgrepo: docker-software-package-repo-absent
+      - {{ resource_repo_clean }}: docker-software-package-repo-absent
             {%- endif %}
 
         {%- elif grains.os_family == 'MacOS' %}

diff --git a/docker/software/package/repo/clean.sls b/docker/software/package/repo/clean.sls
@@ -5,13 +5,18 @@
 {%- from tplroot ~ "/map.jinja" import data as d with context %}
 
     {%- if 'repo' in d.pkg.docker and d.pkg.docker.repo %}
-        {%- from tplroot ~ "/files/macros.jinja" import format_kwargs with context %}
 
 docker-software-package-repo-absent:
+        {%- if grains.os_family != 'Debian' %}
   pkgrepo.absent:
-    - name: {{ d.pkg.docker.repo.name }}
+    - name: {{ d.pkg.docker.repo.name | yaml_dquote }}
+
+        {%- else %}
+        # Due to this bug https://github.com/saltstack/salt/issues/51656#issuecomment-1032882625
+        # we should delete the repo file using other method
+  file.absent:
+    - name: {{ d.pkg.docker.repo.file }}
 
-        {% if grains.os_family == 'Debian' %}
 docker-software-package-repo-keyring-absent:
   file.absent:
     - name: {{ d.pkg.docker.repo_keyring }}