aboutsummaryrefslogtreecommitdiffstats
path: root/mcp/reclass/classes/cluster
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-01-22 02:10:03 +0100
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-01-22 03:03:51 +0100
commit6ab6935577900e598ca60aaed14d2e73f7b1633f (patch)
treed754301c5bcf389108922ab7737e8da7e2e7aa4b /mcp/reclass/classes/cluster
parentd06bcfb72c44b507c3efee4de00f415869f48450 (diff)
[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 <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'mcp/reclass/classes/cluster')
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/include/proxy.yml9
1 files changed, 5 insertions, 4 deletions
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/include/proxy.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/include/proxy.yml
index 5d7475812..3c324db8b 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/include/proxy.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-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