Replace cmd.run by aptkey.added for adding keys
Change-Id: I39d082d678b3873efbfdd5b1e332fbf5bd6f558d
Related: PROD-26981 (PROD-26981)
Depends-On: I210728caffc75ac11f50029fa0e63d6af70e2e32
diff --git a/linux/system/repo.sls b/linux/system/repo.sls
index 73bb33d..3322f07 100644
--- a/linux/system/repo.sls
+++ b/linux/system/repo.sls
@@ -80,11 +80,11 @@
- name: /etc/apt/preferences.d/{{ name }}
{%- endif %}
- {%- if repo.get('key') %}
+ {%- if repo.get('key') and grains['saltversioninfo'] < [2018, 3] %}
linux_repo_{{ name }}_key:
{% set repo_key = salt['hashutil.base64_b64encode'](repo.key) %}
- cmd.run:
- - name: "echo '{{ repo_key }}' | base64 -d | apt-key add -"
+ aptkey.added:
+ - key_text: {{ repo_key }}
- require_in:
{%- if repo.get('default', False) %}
- file: default_repo_list
@@ -105,8 +105,8 @@
#}
{%- elif repo.key_url|default(False) and grains['saltversioninfo'] < [2017, 7] and not repo.key_url.startswith('salt://') %}
linux_repo_{{ name }}_key:
- cmd.run:
- - name: "curl -sL {{ repo.key_url }} | apt-key add -"
+ aptkey.added:
+ - key_url: {{ repo.key_url }}
- require_in:
{%- if repo.get('default', False) %}
- file: default_repo_list
@@ -144,6 +144,9 @@
{%- if repo.key_url is defined and (grains['saltversioninfo'] >= [2017, 7] or repo.key_url.startswith('salt://')) %}
- key_url: {{ repo.key_url }}
{%- endif %}
+ {%- if repo.key is defined and grains['saltversioninfo'] >= [2018, 3] %}
+ - key_text: '{{ repo.key | replace("\n", "\\n") }}'
+ {%- endif %}
- consolidate: {{ repo.get('consolidate', False) }}
- require:
- file: /etc/apt/apt.conf.d/99proxies-salt-{{ name }}