From 9f2d08ea5b0bd69b282a174e73bd17ee6cafffb1 Mon Sep 17 00:00:00 2001
From: Alexandre Allard <alexandre.allard@scality.com>
Date: Fri, 6 Dec 2019 15:51:28 +0100
Subject: [PATCH] salt: add proxies configuration in pillar

Refs: #2052
---
 salt/_pillar/metalk8s.py    | 3 ++-
 salt/metalk8s/defaults.yaml | 2 ++
 salt/metalk8s/map.jinja     | 4 ++++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/salt/_pillar/metalk8s.py b/salt/_pillar/metalk8s.py
index 7fd0267a93..a09a580b70 100644
--- a/salt/_pillar/metalk8s.py
+++ b/salt/_pillar/metalk8s.py
@@ -138,7 +138,8 @@ def ext_pillar(minion_id, pillar, bootstrap_config):
 
     result = {
         'networks': _load_networks(config),
-        'metalk8s': metal_data
+        'metalk8s': metal_data,
+        'proxies': config.get('proxies', {})
     }
 
     if not isinstance(metal_data['archives'], list):
diff --git a/salt/metalk8s/defaults.yaml b/salt/metalk8s/defaults.yaml
index 36e9d67c97..9ff11e3d30 100644
--- a/salt/metalk8s/defaults.yaml
+++ b/salt/metalk8s/defaults.yaml
@@ -94,3 +94,5 @@ coredns:
   reverse_cidrs: in-addr.arpa ip6.arpa
 
 upgrade: false        # define if we're on an upgrade case
+
+proxies: {}
diff --git a/salt/metalk8s/map.jinja b/salt/metalk8s/map.jinja
index 134a8b4a99..b3c49fdf1d 100644
--- a/salt/metalk8s/map.jinja
+++ b/salt/metalk8s/map.jinja
@@ -217,3 +217,7 @@
 {% set nginx_ingress = salt['grains.filter_by']({
   'default': {}
 }, merge=defaults.get('nginx-ingress')) %}
+
+{% set proxies = salt['grains.filter_by']({
+  'default': {}
+}, merge=defaults.get('proxies')) %}