aboutsummaryrefslogtreecommitdiffstats
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-24 15:50:01 +0000
commit82050de5fa77139d8e117683cb3c0084e5b7f250 (patch)
treef0044724fa9c2203f60bdc854cc994014e832621
parentc24aa2e8919bc13f14236677503983075e35f562 (diff)
Rectify ODL repository apt key
Change-Id: Iaa917be9f8f86c328ce4d503923a0d7cca680434 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com> (cherry picked from commit d081166c1cd7698416a7e5cd2ea871b038de35b8)
-rw-r--r--mcp/patches/0011-system.repo-Debian-Add-keyserver-proxy-support.patch28
-rw-r--r--mcp/salt-formulas/opendaylight/server.sls12
2 files changed, 24 insertions, 16 deletions
diff --git a/mcp/patches/0011-system.repo-Debian-Add-keyserver-proxy-support.patch b/mcp/patches/0011-system.repo-Debian-Add-keyserver-proxy-support.patch
index 8fb9bafe7..1ff519e84 100644
--- a/mcp/patches/0011-system.repo-Debian-Add-keyserver-proxy-support.patch
+++ b/mcp/patches/0011-system.repo-Debian-Add-keyserver-proxy-support.patch
@@ -26,20 +26,22 @@ unchanged for backwards compatibility.
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
---
README.rst | 16 ++++++++++++++++
- linux/system/repo.sls | 38 ++++++++++++++++++++++++++++++++++++++
- 2 files changed, 54 insertions(+)
+ linux/system/repo.sls | 40 ++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 56 insertions(+)
diff --git a/linux/system/repo.sls b/linux/system/repo.sls
-index 5d4d059..964db3f 100644
+index 5d4d059..724db5a 100644
--- a/linux/system/repo.sls
+++ b/linux/system/repo.sls
-@@ -96,13 +96,48 @@ linux_repo_{{ name }}_key:
+@@ -96,13 +96,50 @@ linux_repo_{{ name }}_key:
- name: "curl -s {{ repo.key_url }} | apt-key add -"
- watch:
- file: default_repo_list
++{%- if system.proxy.keyserver is defined %}
+ - env:
-+ - http_proxy: {{ system.proxy.get('keyserver', {}).get('http', None) }}
-+ - https_proxy: {{ system.proxy.get('keyserver', {}).get('https', None) }}
++ - http_proxy: {{ system.proxy.get('keyserver', {}).get('http', '') }}
++ - https_proxy: {{ system.proxy.get('keyserver', {}).get('https', '') }}
++{%- endif %}
{%- endif %}
@@ -62,8 +64,8 @@ index 5d4d059..964db3f 100644
+ cmd.run:
+ - name: "curl -s {{ repo.key_url }} | apt-key add -"
+ - env:
-+ - http_proxy: {{ system.proxy.get('keyserver', {}).get('http', None) }}
-+ - https_proxy: {{ system.proxy.get('keyserver', {}).get('https', None) }}
++ - http_proxy: {{ system.proxy.get('keyserver', {}).get('http', '') }}
++ - https_proxy: {{ system.proxy.get('keyserver', {}).get('https', '') }}
+
+{%- elif repo.key_id is defined and repo.key_server is defined %}
+
@@ -71,8 +73,8 @@ index 5d4d059..964db3f 100644
+ cmd.run:
+ - name: "apt-key adv --keyserver {{ repo.key_server }} --recv {{ repo.key_id }}"
+ - env:
-+ - http_proxy: {{ system.proxy.get('keyserver', {}).get('http', None) }}
-+ - https_proxy: {{ system.proxy.get('keyserver', {}).get('https', None) }}
++ - http_proxy: {{ system.proxy.get('keyserver', {}).get('http', '') }}
++ - https_proxy: {{ system.proxy.get('keyserver', {}).get('https', '') }}
+
+{%- endif %}
+
@@ -82,7 +84,7 @@ index 5d4d059..964db3f 100644
linux_repo_{{ name }}:
pkgrepo.managed:
{%- if repo.ppa is defined %}
-@@ -115,6 +150,7 @@ linux_repo_{{ name }}:
+@@ -115,6 +152,7 @@ linux_repo_{{ name }}:
{%- endif %}
- file: /etc/apt/sources.list.d/{{ name }}.list
- clean_file: {{ repo.clean|default(True) }}
@@ -90,7 +92,7 @@ index 5d4d059..964db3f 100644
{%- if repo.key_id is defined %}
- keyid: {{ repo.key_id }}
{%- endif %}
-@@ -124,6 +160,7 @@ linux_repo_{{ name }}:
+@@ -124,6 +162,7 @@ linux_repo_{{ name }}:
{%- if repo.key_url is defined %}
- key_url: {{ repo.key_url }}
{%- endif %}
@@ -98,7 +100,7 @@ index 5d4d059..964db3f 100644
- consolidate: {{ repo.get('consolidate', False) }}
- clean_file: {{ repo.get('clean_file', False) }}
- refresh_db: {{ repo.get('refresh_db', True) }}
-@@ -140,6 +177,7 @@ linux_repo_{{ name }}:
+@@ -140,6 +179,7 @@ linux_repo_{{ name }}:
{%- endif %}
{%- endif %}
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: