fix(repo): distro/release are not always the same

[arvados-formula.git] / arvados / repo / install.sls

diff --git a/arvados/repo/install.sls b/arvados/repo/install.sls
index 57d1ed222ef2a5409f47489124fd180fb9011037..cd42aaa9afb7a20bd366001d6250bfc4f7ba9585 100644 (file)
--- a/arvados/repo/install.sls
+++ b/arvados/repo/install.sls
@@ -5,19 +5,21 @@
 {%- set tplroot = tpldir.split('/')[0] %}
 {%- from tplroot ~ "/map.jinja" import arvados with context %}
 
-{%- if arvados.use_upstream_repo -%}
-  {%- if grains.get('os_family') == 'Debian' -%}
+{%- if arvados.use_upstream_repo %}
+  {%- if grains.get('os_family') == 'Debian' %}
+    {%- set distro = grains.get('lsb_distrib_codename') %}
+
     {%- if arvados.release == 'testing' %}
-      {%- set release = grains.get('lsb_distrib_codename') ~ '-testing' %}
+      {%- set release = distro ~ '-testing' %}
     {%- elif arvados.release == 'development' %}
-      {%- set release = grains.get('lsb_distrib_codename') ~ '-dev' %}
+      {%- set release = distro ~ '-dev' %}
     {%- else %}
-      {%- set release = grains.get('lsb_distrib_codename') %}
+      {%- set release = distro %}
     {%- endif %}
 arvados-repo-install-pkgrepo-managed:
   pkgrepo.managed:
     - humanname: {{ arvados.repo.humanname }}
-    - name: deb {{ arvados.repo.url_base }}/ {{ release }} main
+    - name: deb {{ arvados.repo.url_base }}/{{ distro }} {{ release }} main
     - file: {{ arvados.repo.file }}
     - key_url: {{ arvados.repo.key_url }}