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 18:17:46 +0200 |
| commit | 6924fe7e4cadeb5dbe6857adb413d688209bd4e1 (patch) | |
| tree | 7d5fc6437c614363b505288c06b8ccd9345d1556 /mcp | |
| parent | 61783aec0db25652b11d6858b3103cc12d540b76 (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>
Diffstat (limited to 'mcp')
| -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 5f53e6a18..1346177ca 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: |