From 0c7d890cdb20fdcf2a5e0e0a629088ee045cf4af Mon Sep 17 00:00:00 2001
From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Date: Sat, 20 Jan 2018 19:56:47 +0100
Subject: [PATCH] [baremetal] Add upstream (lab) proxy support

If upstream proxy is defined in IDF, propagate it to pillar data:
- linux:system:proxy:keyserver:http(s) for cfg01, mas01;
- maas:region:upstream_proxy for mas01;

Sample IDF config:

idf:
  fuel:
    network:
      upstream_proxy:
        address: 10.0.2.2
        port: 3128

JIRA: FUEL-317

Change-Id: I12be815e1b4564227fb09c20ce06cd71e7d433b6
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
---
 .../baremetal-mcp-ocata-common-ha/infra/config.yml |  1 +
 .../infra/lab_proxy_pdf.yml.j2                     | 24 ++++++++++++++++++++++
 .../baremetal-mcp-ocata-common-ha/infra/maas.yml   |  1 +
 3 files changed, 26 insertions(+)
 create mode 100644 mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/lab_proxy_pdf.yml.j2

diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/config.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/config.yml
index 0b1698691..5fbc22f1f 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/config.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/config.yml
@@ -25,6 +25,7 @@ classes:
   # - system.reclass.storage.system.stacklight_monitor_cluster
   # - system.reclass.storage.system.stacklight_telemetry_cluster
   - system.reclass.storage.system.infra_maas_single
+  - cluster.baremetal-mcp-ocata-common-ha.infra.lab_proxy_pdf
 parameters:
   _param:
     salt_master_base_environment: prd
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/lab_proxy_pdf.yml.j2 b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/lab_proxy_pdf.yml.j2
new file mode 100644
index 000000000..0e95d2d1d
--- /dev/null
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/lab_proxy_pdf.yml.j2
@@ -0,0 +1,24 @@
+##############################################################################
+# 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 %}
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/maas.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/maas.yml
index 04ffdb44d..11369081d 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/maas.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/maas.yml
@@ -9,6 +9,7 @@
 classes:
   - system.maas.region.single
   - service.maas.cluster.single
+  - cluster.baremetal-mcp-ocata-common-ha.infra.lab_proxy_pdf
 parameters:
   _param:
     dhcp_interface: ${_param:opnfv_fn_vm_primary_interface}
-- 
2.16.6