summaryrefslogtreecommitdiffstats
path: root/mcp/salt-formulas/opendaylight/server.sls
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 19:31:22 +0000
commit56cfed1a8981a16f2671754d8aa29f7c850a0ee0 (patch)
treed80671b1dcfe83ed809f24bf6f3309e44034f651 /mcp/salt-formulas/opendaylight/server.sls
parentf84878774000718216dfb0575a55a63c03c2b39d (diff)
[salt-formulas] opendaylight: Fix noproxy caseopnfv-6.2.1
Change-Id: I192cda7412151b2974e1bcd79a51f7593acace5d Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit b52c4df4061fd7a51aad94f144bb1326fa8a8b5a)
Diffstat (limited to 'mcp/salt-formulas/opendaylight/server.sls')
-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 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: