summaryrefslogtreecommitdiffstats
path: root/mcp/salt-formulas/opendaylight/server.sls
diff options
context:
space:
mode:
Diffstat (limited to 'mcp/salt-formulas/opendaylight/server.sls')
-rw-r--r--mcp/salt-formulas/opendaylight/server.sls12
1 files changed, 9 insertions, 3 deletions
diff --git a/mcp/salt-formulas/opendaylight/server.sls b/mcp/salt-formulas/opendaylight/server.sls
index 1f0475062..f953cddc0 100644
--- a/mcp/salt-formulas/opendaylight/server.sls
+++ b/mcp/salt-formulas/opendaylight/server.sls
@@ -12,10 +12,16 @@
opendaylight_repo_key:
cmd.run:
- - name: "apt-key adv --keyserver keyserver.ubuntu.com --recv 49B07274951063870A8B7EAE7B8AA1A344C05248"
+ - name: "apt-key adv --keyserver keyserver.ubuntu.com --recv 44C05248"
+{%- if system.proxy is defined and system.proxy.keyserver is defined %}
- env:
- - http_proxy: {{ system.proxy.get('keyserver', {}).get('http', None) }}
- - https_proxy: {{ system.proxy.get('keyserver', {}).get('https', None) }}
+{%- if system.proxy.keyserver.http is defined %}
+ - http_proxy: {{ system.proxy.keyserver.http }}
+{%- endif %}
+{%- if system.proxy.keyserver.https is defined %}
+ - https_proxy: {{ system.proxy.keyserver.https }}
+{%- endif %}
+{%- endif %}
opendaylight_repo:
pkgrepo.managed: