From 5acee090a5ecd7bcb5d66769ff83ef37e8e43dae Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Wed, 31 Jan 2018 02:12:51 +0100 Subject: [baremetal] Use upstream lab proxy for keyservers Proxy chainloading does not always work for keyserver requests, so: - mv common.infra.lab_proxy_pdf common.include.lab_proxy_pdf; - mv common.include.proxy common.include.maas_proxy; - include lab_proxy_pdf after each maas_proxy, so if upstream_proxy is defined, it will override the MaaS proxy; JIRA: FUEL-317 Change-Id: I63749be0d350ea73ea2cf6e629710766b14ecb73 Signed-off-by: Alexandru Avadanii --- .../mcp-pike-common-ha/include/maas_proxy.yml | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 mcp/reclass/classes/cluster/mcp-pike-common-ha/include/maas_proxy.yml (limited to 'mcp/reclass/classes/cluster/mcp-pike-common-ha/include/maas_proxy.yml') 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 new file mode 100644 index 000000000..3c324db8b --- /dev/null +++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/include/maas_proxy.yml @@ -0,0 +1,24 @@ +############################################################################## +# Copyright (c) 2017 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 +############################################################################## +--- +parameters: + # NOTE: Apt proxy is set by curtin, Salt minion proxy is configured below, + # only enable proxy via /etc/environment if you need it for smth else + # linux: + # system: + # env: + # http_proxy: http://${_param:infra_maas_node01_deploy_address}:8000 + # https_proxy: http://${_param:infra_maas_node01_deploy_address}:8000 + # no_proxy: + # - .local + linux: + system: + proxy: + keyserver: + http: http://${_param:infra_maas_node01_deploy_address}:8000 + https: http://${_param:infra_maas_node01_deploy_address}:8000 -- cgit 1.2.3-korg