commit 6c0046ac332b090cb6243799e644568a6cd433c3
author mcp-jenkins <mcp-jenkins@mirantis.com> Thu Jan 31 11:09:29 2019 +0000
committer Gerrit Code Review <mail@domain.com> Thu Jan 31 11:09:29 2019 +0000
tree 4bfcda5e474c0162023e0662080ade59985fe4ac
parent ad684fd1b780d785f99072a36c592e0b5f7fd7a0
parent 2106ff8090289a0baaae60d0f4030186b1133098

Merge "Revert "Import apt-key keys only if they don't exist""

linux/system/repo.sls

diff --git a/linux/system/repo.sls b/linux/system/repo.sls
index d8794d8..73bb33d 100644
--- a/linux/system/repo.sls
+++ b/linux/system/repo.sls
@@ -85,7 +85,6 @@
         {% set repo_key = salt['hashutil.base64_b64encode'](repo.key) %}
   cmd.run:
     - name: "echo '{{ repo_key }}' | base64 -d | apt-key add -"
-    - unless: "apt-key finger | grep -q \"$(echo '{{ repo_key }}' | base64 -d | gpg --with-fingerprint -o - | grep -wi 'fingerprint')\""
     - require_in:
         {%- if repo.get('default', False) %}
       - file: default_repo_list