[repos] Replace keyserver accesses with pillar GPG

JIRA: FUEL-392

Change-Id: Ia21840c7561a14a5eeed3d08bf89eb2dbf9acc3a
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit d7bf560e12151853c3121ba39ad9bf6bd47befcf)

1 files changed, 0 insertions, 100 deletions

diff --git a/mcp/patches/salt-formula-linux/0002-Set-ovs-bridges-as-L3-interfaces.patch b/mcp/patches/salt-formula-linux/0002-Set-ovs-bridges-as-L3-interfaces.patch
deleted file mode 100644
index 390a0bfcd..000000000
--- a/mcp/patches/salt-formula-linux/0002-Set-ovs-bridges-as-L3-interfaces.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-: 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: Michael Polenchuk <mpolenchuk@mirantis.com>
-Date: Wed, 28 Feb 2018 17:54:28 +0400
-Subject: [PATCH] Set ovs bridges as L3 interfaces
-
-Change-Id: I1e83129cc184cf481bea21d7aa452bf60d9e0499
----
- linux/files/ovs_bridge      | 18 ++++++++++++++++++
- linux/files/ovs_port        |  7 ++++++-
- linux/network/interface.sls | 28 ++++++++++++++++++++++++++++
- 3 files changed, 52 insertions(+), 1 deletion(-)
- create mode 100644 linux/files/ovs_bridge
-
-diff --git a/linux/files/ovs_bridge b/linux/files/ovs_bridge
-new file mode 100644
-index 0000000..d33864c
---- /dev/null
-+++ b/linux/files/ovs_bridge
-@@ -0,0 +1,18 @@
-+auto {{ bridge_name }}
-+allow-ovs {{ bridge_name }}
-+iface {{ bridge_name }} inet static
-+  ovs_type OVSBridge
-+  address {{ bridge.address }}
-+  netmask {{ bridge.netmask }}
-+  {%- if bridge.use_interfaces is defined %}
-+  ovs_ports {{ bridge.use_interfaces|join(' ') }}
-+  {%- endif %}
-+  {%- if bridge.datapath_type is defined %}
-+  ovs_extra set Bridge ${IFACE} datapath_type={{ bridge.datapath_type }}
-+  {%- endif %}
-+  {%- if bridge.gateway is defined %}
-+  gateway {{ bridge.gateway }}
-+  {%- endif %}
-+  {%- if bridge.name_servers is defined %}
-+  dns-nameservers {{ bridge.name_servers | join(' ') }}
-+  {%- endif %}
-diff --git a/linux/files/ovs_port b/linux/files/ovs_port
-index 222ca8e..03072cd 100644
---- a/linux/files/ovs_port
-+++ b/linux/files/ovs_port
-@@ -1,6 +1,11 @@
--auto {{ port_name }}
-+# With systemd, adding OVS bridges as 'auto' can cause race conditions
-+# https://github.com/openvswitch/ovs/blob/master/debian/openvswitch-switch.README.Debian
-+# auto {{ port_name }}
- allow-{{ port.bridge }} {{ port_name }}
- iface {{ port_name }} inet {{ port.get('proto', 'manual') }}
-+{%- if '.' in port_name %}
-+vlan-raw-device {{ port_name.split('.')[0] }}
-+{%- endif %}
- ovs_type {{ port.get('ovs_port_type', 'OVSIntPort') }}
- mtu {{ port.get('mtu', '1500') }}
- ovs_bridge {{ port.bridge }}
-diff --git a/linux/network/interface.sls b/linux/network/interface.sls
-index c2d2a23..7efdc80 100644
---- a/linux/network/interface.sls
-+++ b/linux/network/interface.sls
-@@ -91,6 +91,34 @@ add_int_{{ int_name }}_to_ovs_dpdk_bridge_{{ interface_name }}:
- ovs_bridge_{{ interface_name }}:
-   openvswitch_bridge.present:
-   - name: {{ interface_name }}
-+{%- if interface.get('proto', 'manual') == 'static' %}
-+  file.managed:
-+  - name: /etc/network/interfaces.u/ifcfg-{{ interface_name }}
-+  - makedirs: True
-+  - source: salt://linux/files/ovs_bridge
-+  - defaults:
-+      bridge: {{ interface|yaml }}
-+      bridge_name: {{ interface_name }}
-+  - template: jinja
-+
-+linux_interfaces_include_{{ interface_name }}:
-+  file.prepend:
-+  - name: /etc/network/interfaces
-+  - text: |
-+      source /etc/network/interfaces.d/*
-+      # Workaround for Upstream-Bug: https://github.com/saltstack/salt/issues/40262
-+      source /etc/network/interfaces.u/*
-+
-+ovs_bridge_up_{{ interface_name }}:
-+  cmd.run:
-+  - name: ifup --ignore-errors {{ interface_name }}
-+  - require:
-+    - file: ovs_bridge_{{ interface_name }}
-+    - openvswitch_bridge: ovs_bridge_{{ interface_name }}
-+    - file: linux_interfaces_final_include
-+  - unless:
-+    - ip link show {{ interface_name }} | grep -q '\<UP\>'
-+{%- endif %}
-
- {# add linux network interface into OVS bridge #}
- {%- for int_name, int in network.interface.items() %}