summaryrefslogtreecommitdiffstats
path: root/mcp
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-07-02 21:30:21 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-07-02 21:30:21 +0200
commitb52c4df4061fd7a51aad94f144bb1326fa8a8b5a (patch)
treec017369293cf0029107c0de76dd4b57fc96b6709 /mcp
parent6924fe7e4cadeb5dbe6857adb413d688209bd4e1 (diff)
[salt-formulas] opendaylight: Fix noproxy case
Change-Id: I192cda7412151b2974e1bcd79a51f7593acace5d Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'mcp')
-rw-r--r--mcp/salt-formulas/opendaylight/server.sls2
1 files changed, 2 insertions, 0 deletions
diff --git a/mcp/salt-formulas/opendaylight/server.sls b/mcp/salt-formulas/opendaylight/server.sls
index 1346177ca..206dc52a2 100644
--- a/mcp/salt-formulas/opendaylight/server.sls
+++ b/mcp/salt-formulas/opendaylight/server.sls
@@ -13,6 +13,7 @@
opendaylight_repo_key:
cmd.run:
- name: "apt-key adv --keyserver keyserver.ubuntu.com --recv 44C05248"
+{%- if system.proxy is defined and system.proxy.pkg is defined %}
- env:
{%- if system.proxy.pkg.http is defined %}
- http_proxy: {{ system.proxy.pkg.http }}
@@ -20,6 +21,7 @@ opendaylight_repo_key:
{%- if system.proxy.pkg.https is defined %}
- https_proxy: {{ system.proxy.pkg.https }}
{%- endif %}
+{%- endif %}
opendaylight_repo:
pkgrepo.managed: