From 82050de5fa77139d8e117683cb3c0084e5b7f250 Mon Sep 17 00:00:00 2001 From: Michael Polenchuk Date: Tue, 23 Jan 2018 13:47:20 +0400 Subject: Rectify ODL repository apt key Change-Id: Iaa917be9f8f86c328ce4d503923a0d7cca680434 Signed-off-by: Michael Polenchuk (cherry picked from commit d081166c1cd7698416a7e5cd2ea871b038de35b8) --- mcp/salt-formulas/opendaylight/server.sls | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'mcp/salt-formulas/opendaylight/server.sls') diff --git a/mcp/salt-formulas/opendaylight/server.sls b/mcp/salt-formulas/opendaylight/server.sls index 1f0475062..f953cddc0 100644 --- a/mcp/salt-formulas/opendaylight/server.sls +++ b/mcp/salt-formulas/opendaylight/server.sls @@ -12,10 +12,16 @@ opendaylight_repo_key: cmd.run: - - name: "apt-key adv --keyserver keyserver.ubuntu.com --recv 49B07274951063870A8B7EAE7B8AA1A344C05248" + - name: "apt-key adv --keyserver keyserver.ubuntu.com --recv 44C05248" +{%- if system.proxy is defined and system.proxy.keyserver is defined %} - env: - - http_proxy: {{ system.proxy.get('keyserver', {}).get('http', None) }} - - https_proxy: {{ system.proxy.get('keyserver', {}).get('https', None) }} +{%- if system.proxy.keyserver.http is defined %} + - http_proxy: {{ system.proxy.keyserver.http }} +{%- endif %} +{%- if system.proxy.keyserver.https is defined %} + - https_proxy: {{ system.proxy.keyserver.https }} +{%- endif %} +{%- endif %} opendaylight_repo: pkgrepo.managed: -- cgit 1.2.3-korg