18761: use repository keyring instead of key_id

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

diff --git a/arvados/repo/install.sls b/arvados/repo/install.sls
index 1146f30e5f2d004171923edb84232f9725182a03..c58fbe51736063fe2851f2901ac577f177da1a25 100644 (file)
--- a/arvados/repo/install.sls
+++ b/arvados/repo/install.sls
@@ -4,22 +4,37 @@
 {#- Get the `tplroot` from `tpldir` #}
 {%- set tplroot = tpldir.split('/')[0] %}
 {%- from tplroot ~ "/map.jinja" import arvados with context %}
+{%- from tplroot ~ "/libtofs.jinja" import files_switch with context %}
 
 {%- 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-keyring-managed:
+  file.managed:
+    - name: {{ arvados.repo.repo_keyring }}
+    - source: {{ files_switch(['arvados-archive-keyring.gpg'],
+                              lookup='arvados-repo-install-pkgrepo-keyring-managed'
+                 )
+              }}
+    - require_in:
+      - pkgrepo: arvados-repo-install-pkgrepo-managed
+
 arvados-repo-install-pkgrepo-managed:
   pkgrepo.managed:
     - humanname: {{ arvados.repo.humanname }}
-    - name: deb {{ arvados.repo.url_base }}/ {{ release }} main
+    - name: >-
+        deb [signed-by={{ arvados.repo.repo_keyring }} arch=amd64]
+        {{ arvados.repo.url_base }}/{{ distro }} {{ release }} main
     - file: {{ arvados.repo.file }}
-    - key_url: {{ arvados.repo.key_url }}
 
   {%- elif grains.get('os_family') == 'RedHat' %}
     {%- if arvados.release == 'testing' %}