From f84878774000718216dfb0575a55a63c03c2b39d Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Mon, 2 Jul 2018 18:17:46 +0200 Subject: [salt-formulas] opendaylight: Adjust keyserver prx Align opendaylight/server sls with the latest salt-formula-linux version of keyserver requests support behind proxy. Change-Id: I55f9010eec8b74932d4a28215ecf9647deb3d82c Signed-off-by: Alexandru Avadanii (cherry picked from commit 6924fe7e4cadeb5dbe6857adb413d688209bd4e1) --- mcp/salt-formulas/opendaylight/server.sls | 10 ++++------ 1 file 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: -- cgit 1.2.3-korg