summaryrefslogtreecommitdiffstats
path: root/mcp/patches
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-09-20 20:02:45 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-09-23 21:31:13 +0000
commit41ba73d2891f933c4d1f0e333fb9b5c7fe9c9322 (patch)
treea91b263c19fe1b1e552c99768f05c27343cf3072 /mcp/patches
parenta7b0143bfc579a7a6a1b63ebf3f7ab84f9a2960f (diff)
[repos] Replace keyserver accesses with pillar GPG
JIRA: FUEL-392 Change-Id: Ia21840c7561a14a5eeed3d08bf89eb2dbf9acc3a Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit d7bf560e12151853c3121ba39ad9bf6bd47befcf)
Diffstat (limited to 'mcp/patches')
-rw-r--r--mcp/patches/salt-formula-linux/0001-Set-ovs-bridges-as-L3-interfaces.patch (renamed from mcp/patches/salt-formula-linux/0002-Set-ovs-bridges-as-L3-interfaces.patch)0
-rw-r--r--mcp/patches/salt-formula-linux/0001-system.repo-Debian-Use-proxy-for-keyservers.patch157
2 files changed, 0 insertions, 157 deletions
diff --git a/mcp/patches/salt-formula-linux/0002-Set-ovs-bridges-as-L3-interfaces.patch b/mcp/patches/salt-formula-linux/0001-Set-ovs-bridges-as-L3-interfaces.patch
index 390a0bfcd..390a0bfcd 100644
--- a/mcp/patches/salt-formula-linux/0002-Set-ovs-bridges-as-L3-interfaces.patch
+++ b/mcp/patches/salt-formula-linux/0001-Set-ovs-bridges-as-L3-interfaces.patch
diff --git a/mcp/patches/salt-formula-linux/0001-system.repo-Debian-Use-proxy-for-keyservers.patch b/mcp/patches/salt-formula-linux/0001-system.repo-Debian-Use-proxy-for-keyservers.patch
deleted file mode 100644
index 4ad51e3e0..000000000
--- a/mcp/patches/salt-formula-linux/0001-system.repo-Debian-Use-proxy-for-keyservers.patch
+++ /dev/null
@@ -1,157 +0,0 @@
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-: Copyright (c) 2018 Mirantis Inc., Enea AB and others.
-:
-: All rights reserved. This program and the accompanying materials
-: are made available under the terms of the Apache License, Version 2.0
-: which accompanies this distribution, and is available at
-: http://www.apache.org/licenses/LICENSE-2.0
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-Date: Sun, 3 Jun 2018 19:28:18 +0200
-Subject: [PATCH] system.repo: Debian: Use proxy for keyservers
-
-Previously, when fetching GPG keys for APT keyring, either using
-public key download & import (as for default repos) or via keyserver,
-we relied on simple `curl` calls or passed it down to Salt aptpkg
-module.
-To be able to retrieve APT keys behind a proxy, one used to have to
-configure the proxy for the Salt minion, which does not yet have
-`no_proxy` support (either *all* or *no* traffic hits the proxy).
-
-When `linux:system:proxy` http(s) proxies are set:
-- no longer pass key configuration to Salt aptpkg (until it properly
- supports `no_proxy`);
-- handle all keys explicitly with `curl` and `apt-key`;
-- set 'http(s)_proxy' env vars for `cmd.wait` calls;
-
-If `linux:system:proxy` is not defined, the behavior is
-unchanged for backwards compatibility.
-
-NOTE: If present, per-repo proxies are also used for keyserver access.
-
-system.repo: Fix conditions order for Debian proxy
-
-Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
----
- linux/system/repo.sls | 55 ++++++++++++++++++++++++++++++++++++-------
- 1 file changed, 47 insertions(+), 8 deletions(-)
-
-diff --git a/linux/system/repo.sls b/linux/system/repo.sls
-index 0c0b026..82661f0 100644
---- a/linux/system/repo.sls
-+++ b/linux/system/repo.sls
-@@ -7,18 +7,27 @@ linux_repo_prereq_pkgs:
- - pkgs: {{ system.pkgs }}
- {%- endif %}
-
-+ {%- set proxies = {'system': {}, 'repo': {}} %}
-+
- # global proxy setup
- {%- if grains.os_family == 'Debian' %}
-+
- {%- if system.proxy.get('pkg', {}).get('enabled', False) %}
-+
-+ {%- do proxies.system.update({'https': system.proxy.get('pkg', {}).get('https', None) | default(system.proxy.get('https', None), true)}) %}
-+ {%- do proxies.system.update({'http': system.proxy.get('pkg', {}).get('http', None) | default(system.proxy.get('http', None), true)}) %}
-+ {%- do proxies.system.update({'ftp': system.proxy.get('pkg', {}).get('ftp', None) | default(system.proxy.get('ftp', None), true)}) %}
-+
- /etc/apt/apt.conf.d/99proxies-salt:
- file.managed:
- - template: jinja
- - source: salt://linux/files/apt.conf.d_proxies
- - defaults:
- external_host: False
-- https: {{ system.proxy.get('pkg', {}).get('https', None) | default(system.proxy.get('https', None), true) }}
-- http: {{ system.proxy.get('pkg', {}).get('http', None) | default(system.proxy.get('http', None), true) }}
-- ftp: {{ system.proxy.get('pkg', {}).get('ftp', None) | default(system.proxy.get('ftp', None), true) }}
-+ https: {{ proxies.system.https }}
-+ http: {{ proxies.system.http }}
-+ ftp: {{ proxies.system.ftp }}
-+
- {%- else %}
- /etc/apt/apt.conf.d/99proxies-salt:
- file.absent
-@@ -43,16 +52,20 @@ purge_sources_list_d_repos:
- # per repository proxy setup
- {%- if repo.get('proxy', {}).get('enabled', False) %}
- {%- set external_host = repo.proxy.get('host', None) or repo.source.split('/')[2] %}
-+ {%- do proxies.repo.update({'https': repo.proxy.get('https', None) or system.proxy.get('pkg', {}).get('https', None) | default(system.proxy.get('https', None), true)}) %}
-+ {%- do proxies.repo.update({'http': repo.proxy.get('http', None) or system.proxy.get('pkg', {}).get('http', None) | default(system.proxy.get('http', None), true)}) %}
-+ {%- do proxies.repo.update({'ftp': repo.proxy.get('ftp', None) or system.proxy.get('pkg', {}).get('ftp', None) | default(system.proxy.get('ftp', None), true)}) %}
- /etc/apt/apt.conf.d/99proxies-salt-{{ name }}:
- file.managed:
- - template: jinja
- - source: salt://linux/files/apt.conf.d_proxies
- - defaults:
- external_host: {{ external_host }}
-- https: {{ repo.proxy.get('https', None) or system.proxy.get('pkg', {}).get('https', None) | default(system.proxy.get('https', None), True) }}
-- http: {{ repo.proxy.get('http', None) or system.proxy.get('pkg', {}).get('http', None) | default(system.proxy.get('http', None), True) }}
-- ftp: {{ repo.proxy.get('ftp', None) or system.proxy.get('pkg', {}).get('ftp', None) | default(system.proxy.get('ftp', None), True) }}
-+ https: {{ proxies.repo.https }}
-+ http: {{ proxies.repo.http }}
-+ ftp: {{ proxies.repo.ftp }}
- {%- else %}
-+ {%- do proxies.repo.update({'https': None, 'http': None, 'ftp': None}) %}
- /etc/apt/apt.conf.d/99proxies-salt-{{ name }}:
- file.absent
- {%- endif %}
-@@ -104,6 +117,13 @@ linux_repo_{{ name }}_key:
- {% else %}
- - pkgrepo: linux_repo_{{ name }}
- {% endif %}
-+ - env:
-+ {%- if proxies.repo.get('https', None) or proxies.system.get('https', None) %}
-+ - https_proxy: {{ proxies.repo.get('https', None) or proxies.system.get('https', None) }}
-+ {%- endif %}
-+ {%- if proxies.repo.get('http', None) or proxies.system.get('http', None) %}
-+ - http_proxy: {{ proxies.repo.get('http', None) or proxies.system.get('http', None) }}
-+ {%- endif %}
- {%- endif %}
-
- {%- if repo.get('default', False) %}
-@@ -111,6 +131,9 @@ linux_repo_{{ name }}_key:
- {%- else %}
-
- {%- if repo.get('enabled', True) %}
-+ {%- set use_proxy = ( ( proxies.repo.get('https', None) or proxies.system.get('https', None) or
-+ proxies.repo.get('http', None) or proxies.system.get('http', None) ) and
-+ repo.key_id is defined and repo.key_server is defined ) %}
- linux_repo_{{ name }}:
- pkgrepo.managed:
- - refresh_db: False
-@@ -126,10 +149,10 @@ linux_repo_{{ name }}:
- {%- endif %}
- - file: /etc/apt/sources.list.d/{{ name }}.list
- - clean_file: {{ repo.get('clean_file', True) }}
-- {%- if repo.key_id is defined %}
-+ {%- if not use_proxy and repo.key_id is defined %}
- - keyid: {{ repo.key_id }}
- {%- endif %}
-- {%- if repo.key_server is defined %}
-+ {%- if not use_proxy and repo.key_server is defined %}
- - keyserver: {{ repo.key_server }}
- {%- endif %}
- {%- if repo.key_url is defined and (grains['saltversioninfo'] >= [2017, 7] or repo.key_url.startswith('salt://')) %}
-@@ -143,6 +166,22 @@ linux_repo_{{ name }}:
- - file: purge_sources_list_d_repos
- {%- endif %}
- {%- endif %}
-+ {%- if use_proxy and repo.key_id is defined and repo.key_server is defined %}
-+linux_repo_{{ name }}_key:
-+ cmd.run:
-+ - name: "apt-key adv --keyserver {{ repo.key_server }} --recv {{ repo.key_id }}"
-+ - unless: 'test -e /etc/apt/sources.list.d/{{ name }}.list'
-+ - require_in:
-+ - pkgrepo: linux_repo_{{ name }}
-+ - env:
-+ {%- if proxies.repo.get('https', None) or proxies.system.get('https', None) %}
-+ - https_proxy: {{ proxies.repo.get('https', None) or proxies.system.get('https', None) }}
-+ {%- endif %}
-+ {%- if proxies.repo.get('http', None) or proxies.system.get('http', None) %}
-+ - http_proxy: {{ proxies.repo.get('http', None) or proxies.system.get('http', None) }}
-+ {%- endif %}
-+ {%- endif %}
-+ {#- repo.enabled is false #}
- {%- else %}
- linux_repo_{{ name }}:
- pkgrepo.absent: