[patch] Drop obsolete OVS port with route support

Since we switched all scenarios to using only global gateway settings
instead of per-interface routes, drop the obsolete patch for OVS
ports with explicit routes.

Change-Id: Ibd28849437b598add9847c991e0276b4d0fc505e
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>

diff --git a/mcp/patches/0007-network.interface-Fix-ifup-OVS-port-with-route.patch b/mcp/patches/0007-network.interface-Fix-ifup-OVS-port-with-route.patch
deleted file mode 100644 (file)
index 2a5e29e..0000000
--- a/mcp/patches/0007-network.interface-Fix-ifup-OVS-port-with-route.patch
+++ /dev/null
@@ -1,39 +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: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-Date: Sun, 31 Dec 2017 16:06:30 +0100
-Subject: [PATCH] network.interface: Fix ifup OVS port with route
-
-This change attempts to fix the following sequence for nodes with
-OVS ports that also have routes defined:
-- state.sls linux.network; system.reboot; state.sls linux.network;
-
-If an OVS port also has a route defined, a route cfg file is
-created in </etc/network/if.{down,up}.d/>, which is sourced after
-system reboot before we (eventually) re-run `interface.sls`, leaving
-the OVS port in UP state, so `ifup` would fail.
-
-Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
----
- linux/network/interface.sls | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/linux/network/interface.sls b/linux/network/interface.sls
-index 921ceac..3bba64e 100644
---- a/linux/network/interface.sls
-+++ b/linux/network/interface.sls
-@@ -146,6 +146,8 @@ ovs_port_up_{{ interface_name }}:
-     - file: ovs_port_{{ interface_name }}_line2
-     - openvswitch_bridge: ovs_bridge_{{ interface.bridge }}
-     - file: linux_interfaces_final_include
-+  - unless:
-+    - ip link show {{ interface_name }} | grep -q '\<UP\>'
-
- {%- endif %}
-

diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list
index a17fd69..baa15d7 100644 (file)
--- a/mcp/patches/patches.list
+++ b/mcp/patches/patches.list
@@ -6,7 +6,6 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 /usr/share/salt-formulas/env: 0002-maas-region-skip-credentials-update.patch
-/usr/share/salt-formulas/env: 0007-network.interface-Fix-ifup-OVS-port-with-route.patch
 /usr/share/salt-formulas/env: 0008-Handle-extra-environment-variables.patch
 /usr/share/salt-formulas/env: 0010-maas-region-allow-timeout-override.patch
 /usr/share/salt-formulas/env: 0011-system.repo-Debian-Add-keyserver-proxy-support.patch