From ba3d7527637414175f5a142fa92cd9ea5d2e3158 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Mon, 22 Jan 2018 02:10:03 +0100 Subject: [patch] system.repo: Add keyserver proxy support Instead of defining a http proxy for all salt-minion traffic, which also includes some Openstack API accesses we can't filter (no_proxy is not yet supported), add & leverage support for proxy configuration during APT keyserver access / key download. JIRA: FUEL-331 Change-Id: I9470807633596c610cfafb141b139ddda2ff096b Signed-off-by: Alexandru Avadanii (cherry picked from commit 6ab6935577900e598ca60aaed14d2e73f7b1633f) --- .../cluster/baremetal-mcp-ocata-common-ha/include/proxy.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'mcp/reclass') diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/include/proxy.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/include/proxy.yml index 5d7475812..3c324db8b 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/include/proxy.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/include/proxy.yml @@ -16,8 +16,9 @@ parameters: # https_proxy: http://${_param:infra_maas_node01_deploy_address}:8000 # no_proxy: # - .local - salt: - minion: + linux: + system: proxy: - host: ${_param:infra_maas_node01_deploy_address} - port: 8000 + keyserver: + http: http://${_param:infra_maas_node01_deploy_address}:8000 + https: http://${_param:infra_maas_node01_deploy_address}:8000 -- cgit 1.2.3-korg