From 832cf66ab95fbc74bf33a5b271869d0d948b4378 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Thu, 7 Jun 2018 13:59:59 +0200 Subject: [patch] Rebase APT keyserver proxy support patch Sync our patch with upstream PR [1]. [1] https://github.com/salt-formulas/salt-formula-linux/pull/138 Change-Id: If3a51d3aef51accee0901c59e1342b42dbe4be4b Signed-off-by: Alexandru Avadanii (cherry picked from commit 78d368731c9582361cc291d5618e01702982f2b9) --- .../classes/cluster/mcp-pike-common-ha/include/lab_proxy_pdf.yml.j2 | 3 ++- mcp/reclass/classes/cluster/mcp-pike-common-ha/include/maas_proxy.yml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'mcp/reclass/classes/cluster/mcp-pike-common-ha') diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/include/lab_proxy_pdf.yml.j2 b/mcp/reclass/classes/cluster/mcp-pike-common-ha/include/lab_proxy_pdf.yml.j2 index 0e95d2d1d..3f238d667 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/include/lab_proxy_pdf.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/include/lab_proxy_pdf.yml.j2 @@ -18,7 +18,8 @@ parameters: linux: system: proxy: - keyserver: + pkg: + enabled: true http: http://{{ upstream_proxy.address }}:{{ upstream_proxy.port }} https: http://{{ upstream_proxy.address }}:{{ upstream_proxy.port }} {%- endif %} diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/include/maas_proxy.yml b/mcp/reclass/classes/cluster/mcp-pike-common-ha/include/maas_proxy.yml index 11878ff2d..e5b263fe8 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/include/maas_proxy.yml +++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/include/maas_proxy.yml @@ -19,6 +19,7 @@ parameters: linux: system: proxy: - keyserver: + pkg: + enabled: true http: http://${_param:infra_maas_node01_deploy_address}:8000 https: http://${_param:infra_maas_node01_deploy_address}:8000 -- cgit 1.2.3-korg