Rectify ODL repository apt key

[fuel.git] / mcp / salt-formulas / opendaylight / server.sls

diff --git a/mcp/salt-formulas/opendaylight/server.sls b/mcp/salt-formulas/opendaylight/server.sls
index 1f04750..f953cdd 100644 (file)
--- 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: