diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-07-02 18:17:46 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-07-02 17:38:14 +0000 |
| commit | f84878774000718216dfb0575a55a63c03c2b39d (patch) | |
| tree | 640acca9d4b64c53e20a11ca2899696eaf99f245 | |
| parent | 4ad7bc825848153f38e321588e597f34d1472d6f (diff) | |
[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 <Alexandru.Avadanii@enea.com>
(cherry picked from commit 6924fe7e4cadeb5dbe6857adb413d688209bd4e1)
| -rw-r--r-- | mcp/salt-formulas/opendaylight/server.sls | 10 |
1 files 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: |