summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mcp/salt-formulas/opendaylight/server.sls10
1 files changed, 4 insertions, 6 deletions
diff --git a/mcp/salt-formulas/opendaylight/server.sls b/mcp/salt-formulas/opendaylight/server.sls
index 453d244c9..71f89822d 100644
--- a/mcp/salt-formulas/opendaylight/server.sls
+++ b/mcp/salt-formulas/opendaylight/server.sls
@@ -13,14 +13,12 @@
opendaylight_repo_key:
cmd.run:
- name: "apt-key adv --keyserver keyserver.ubuntu.com --recv 44C05248"
-{%- if system.proxy is defined and system.proxy.keyserver is defined %}
- env:
-{%- if system.proxy.keyserver.http is defined and grains['dns']['nameservers'][0] in system.proxy.keyserver.http %}
- - http_proxy: {{ system.proxy.keyserver.http }}
-{%- endif %}
-{%- if system.proxy.keyserver.https is defined and grains['dns']['nameservers'][0] in system.proxy.keyserver.https %}
- - https_proxy: {{ system.proxy.keyserver.https }}
+{%- if system.proxy.pkg.http is defined %}
+ - http_proxy: {{ system.proxy.pkg.http }}
{%- endif %}
+{%- if system.proxy.pkg.https is defined %}
+ - https_proxy: {{ system.proxy.pkg.https }}
{%- endif %}
opendaylight_repo: