diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-01-22 02:10:03 +0100 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-01-22 03:03:51 +0100 |
| commit | 6ab6935577900e598ca60aaed14d2e73f7b1633f (patch) | |
| tree | d754301c5bcf389108922ab7737e8da7e2e7aa4b /mcp/salt-formulas/opendaylight/server.sls | |
| parent | d06bcfb72c44b507c3efee4de00f415869f48450 (diff) | |
[patch] system.repo: Add keyserver proxy support
Instead of defining a http proxy for all salt-minion traffic, which
also includes some Openstack API accesses we can't filter (no_proxy
is not yet supported), add & leverage support for proxy configuration
during APT keyserver access / key download.
JIRA: FUEL-331
Change-Id: I9470807633596c610cfafb141b139ddda2ff096b
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'mcp/salt-formulas/opendaylight/server.sls')
| -rw-r--r-- | mcp/salt-formulas/opendaylight/server.sls | 10 |
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: |