Revert "Fix, system.repo don't use curl on fixed pkgrepo.manage"
Commit totally broke all deployment CI job.
This reverts commit 24477c590b0f9ed33d97052c8e73f7bb7cca0fca.
Change-Id: Idce0954f0bd363095069e91edc6941ca78b22c60
diff --git a/linux/system/repo.sls b/linux/system/repo.sls
index 1c005fc..8b93ecb 100644
--- a/linux/system/repo.sls
+++ b/linux/system/repo.sls
@@ -92,14 +92,7 @@
- pkgrepo: linux_repo_{{ name }}
{% endif %}
-{# key_url fetch by curl when salt <2017.7, higher version of salt has fixed bug for using a proxy_host/port specified at minion.conf #}
-{#
- NOTE: curl/cmd.run usage to fetch gpg key has limited functionality behind proxy. Environments with salt >= 2017.7 shoul use
- key_url specified at pkgrepo.manage state (which uses properly configured http_host at minion.conf). Older versions of
- salt require to have proxy set at ENV and curl way to fetch gpg key here can have a sense for backward compatibility.
-#}
-{%- if grains['saltversioninfo'] < [2017, 7] %}
-{%- elif repo.key_url|default(False) and not repo.key_url.startswith('salt://') %}
+{%- elif repo.key_url|default(False) %}
linux_repo_{{ name }}_key:
cmd.run:
@@ -111,7 +104,6 @@
{% else %}
- pkgrepo: linux_repo_{{ name }}
{% endif %}
-{%- endif %} {# key_url fetch by curl when salt <2017.7 #}
{%- endif %} {# 2 #}
@@ -140,9 +132,6 @@
{%- if repo.key_server is defined %}
- keyserver: {{ repo.key_server }}
{%- endif %}
- {%- if repo.key_url is defined and grains['saltversioninfo'] >= [2017, 7] %}
- - key_url: {{ repo.key_url }}
- {%- endif %}
- consolidate: {{ repo.get('consolidate', False) }}
- clean_file: {{ repo.get('clean_file', False) }}
- refresh_db: {{ repo.get('refresh_db', True) }}