salt: add proxies configuration in pillar

Refs: #2052
scality · Dec 16, 2019 · 9f2d08e · 9f2d08e
1 parent f08eb3c
commit 9f2d08e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git 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
@@ -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
@@ -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')) %}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -94,3 +94,5 @@ coredns:
		reverse_cidrs: in-addr.arpa ip6.arpa

		upgrade: false # define if we're on an upgrade case

		proxies: {}