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 --- .../cluster/mcp-pike-common-ha/openstack_interface_vcp_triport.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_interface_vcp_triport.yml') diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_interface_vcp_triport.yml b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_interface_vcp_triport.yml index c1fd625bc..d274ecd87 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_interface_vcp_triport.yml +++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_interface_vcp_triport.yml @@ -7,7 +7,8 @@ ############################################################################## --- classes: - - cluster.mcp-pike-common-ha.include.proxy + - cluster.mcp-pike-common-ha.include.maas_proxy + - cluster.mcp-pike-common-ha.include.lab_proxy_pdf parameters: _param: dhcp_nic: ${_param:opnfv_vcp_vm_primary_interface} -- cgit 1.2.3-korg