X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=mcp%2Fpatches%2F0011-system.repo-Debian-Add-keyserver-proxy-support.patch;h=48e945acda9cc42c79cb257d5b787ea7b213e5f4;hb=9c9a1adc6f2501507a68b1926ea93efcb40782d1;hp=8fb9bafe749f989c32874e0de30225a45906c3ff;hpb=6ab6935577900e598ca60aaed14d2e73f7b1633f;p=fuel.git

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..48e945acd 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
@@ -1,3 +1,11 @@
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+: Copyright (c) 2018 Mirantis Inc., Enea AB and others.
+:
+: All rights reserved. This program and the accompanying materials
+: are made available under the terms of the Apache License, Version 2.0
+: which accompanies this distribution, and is available at
+: http://www.apache.org/licenses/LICENSE-2.0
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
 Date: Mon, 22 Jan 2018 00:28:09 +0100
 Subject: [PATCH] system.repo: Debian: Add keyserver proxy support
@@ -23,23 +31,29 @@ When the new http(s) proxy param is set:
 If linux:system:proxy:keyserver is not defined, the behavior is
 unchanged for backwards compatibility.
 
+To allow runtime decisions whether the keyserver proxy should be used
+add an additional condition for it to match the first nameserver.
+This allows us to mix virtual nodes with MaaS-provisioned nodes in
+Fuel@OPNFV, while keeping the ext_pillar common.
+
 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
 --- 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 and grains['dns']['nameservers'][0] in system.proxy.keyserver.http %}
 +    - 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 %}
 
@@ -48,7 +62,7 @@ index 5d4d059..964db3f 100644
 
  {%- if repo.get('enabled', True) %}
 
-+{%- if system.proxy.keyserver is defined %}
++{%- if system.proxy.keyserver is defined and grains['dns']['nameservers'][0] in system.proxy.keyserver.http %}
 +
 +{%- if repo.get('key') %}
 +
@@ -62,8 +76,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 +85,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,15 +96,15 @@ 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) }}
-+  {%- if system.proxy.keyserver is not defined %}
++  {%- if system.proxy.keyserver is not defined or grains['dns']['nameservers'][0] not in system.proxy.keyserver.http %}
    {%- 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 +112,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 %}