From 56cfed1a8981a16f2671754d8aa29f7c850a0ee0 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Mon, 2 Jul 2018 21:30:21 +0200 Subject: [salt-formulas] opendaylight: Fix noproxy case Change-Id: I192cda7412151b2974e1bcd79a51f7593acace5d Signed-off-by: Alexandru Avadanii (cherry picked from commit b52c4df4061fd7a51aad94f144bb1326fa8a8b5a) --- mcp/salt-formulas/opendaylight/server.sls | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mcp/salt-formulas/opendaylight/server.sls b/mcp/salt-formulas/opendaylight/server.sls index 71f89822d..bc2d4efa4 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: -- cgit 1.2.3-korg