aboutsummaryrefslogtreecommitdiffstats
path: root/mcp/salt-formulas
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2018-01-23 13:47:20 +0400
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-01-23 20:36:36 +0100
commitd081166c1cd7698416a7e5cd2ea871b038de35b8 (patch)
tree472ddd1ec0c7958c7d0e7c35fa1cba82e829c4b2 /mcp/salt-formulas
parentbb3b6968dbccb74959d394fb6426ba5b8fb2c5e3 (diff)
Rectify ODL repository apt key
Change-Id: Iaa917be9f8f86c328ce4d503923a0d7cca680434 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Diffstat (limited to 'mcp/salt-formulas')
-rw-r--r--mcp/salt-formulas/opendaylight/server.sls12
1 files changed, 9 insertions, 3 deletions
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: