[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 <Alexandru.Avadanii@enea.com>

1 files changed, 0 insertions, 24 deletions

diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/lab_proxy_pdf.yml.j2 b/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/lab_proxy_pdf.yml.j2
deleted file mode 100644
index 0e95d2d1d..000000000
--- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/lab_proxy_pdf.yml.j2
+++ /dev/null
@@ -1,24 +0,0 @@
-##############################################################################
-# Copyright (c) 2018 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
-##############################################################################
----
-# We'll craft this class so it can be reused on both cfg01 and mas01
-{%- if conf.idf.fuel.network.upstream_proxy is defined %}
-{%- set upstream_proxy=conf.idf.fuel.network.upstream_proxy %}
-parameters:
-  maas:
-    region:
-      upstream_proxy:
-        address: {{ upstream_proxy.address }}
-        port: {{ upstream_proxy.port }}
-  linux:
-    system:
-      proxy:
-        keyserver:
-          http: http://{{ upstream_proxy.address }}:{{ upstream_proxy.port }}
-          https: http://{{ upstream_proxy.address }}:{{ upstream_proxy.port }}
-{%- endif %}