summaryrefslogtreecommitdiffstats
path: root/mcp/salt-formulas/opendaylight/server.sls
diff options
context:
space:
mode:
Diffstat (limited to 'mcp/salt-formulas/opendaylight/server.sls')
-rw-r--r--mcp/salt-formulas/opendaylight/server.sls10
1 files changed, 8 insertions, 2 deletions
diff --git a/mcp/salt-formulas/opendaylight/server.sls b/mcp/salt-formulas/opendaylight/server.sls
index 30c337c00..1f0475062 100644
--- a/mcp/salt-formulas/opendaylight/server.sls
+++ b/mcp/salt-formulas/opendaylight/server.sls
@@ -6,9 +6,17 @@
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
{% from "opendaylight/map.jinja" import server with context %}
+{% from "linux/map.jinja" import system with context %}
{%- if server.enabled %}
+opendaylight_repo_key:
+ cmd.run:
+ - name: "apt-key adv --keyserver keyserver.ubuntu.com --recv 49B07274951063870A8B7EAE7B8AA1A344C05248"
+ - env:
+ - http_proxy: {{ system.proxy.get('keyserver', {}).get('http', None) }}
+ - https_proxy: {{ system.proxy.get('keyserver', {}).get('https', None) }}
+
opendaylight_repo:
pkgrepo.managed:
# NOTE(armband): PPA handling behind proxy broken, define it explicitly
@@ -17,8 +25,6 @@ opendaylight_repo:
- human_name: opendaylight-ppa
- name: deb http://ppa.launchpad.net/odl-team/nitrogen/ubuntu xenial main
- file: /etc/apt/sources.list.d/odl-team-ubuntu-nitrogen-xenial.list
- - keyid: 49B07274951063870A8B7EAE7B8AA1A344C05248
- - keyserver: keyserver.ubuntu.com
opendaylight:
pkg.installed: