summaryrefslogtreecommitdiffstats
path: root/patches/fuel-library/upstream-backports/0001-Set-net.ipv4.ip_nonlocal_bind-1-for-vrouter-namespac.patch
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-10-01 13:18:11 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-10-09 16:33:43 +0200
commit42f8585ebb8fffad19a89314659ab9129176c3e9 (patch)
treee2cf6a4797bcbd036e080541cc3925f8b209549b /patches/fuel-library/upstream-backports/0001-Set-net.ipv4.ip_nonlocal_bind-1-for-vrouter-namespac.patch
parent6f3a054fc95622f0c002f72c0fac6074bb36c36f (diff)
build: Rework patch mechanism for Fuel submodules
While refactoring the patching mechanism, take care of: - Sync submodule handling with Fuel@OPFNV; - build: Investigate/prepare for moving patches to Fuel@OPNFV; - build: Investigate divergent fuel-mirror; - ISO build: cacheid for Fuel comps should not depend on Armband git commit; CHANGE: Rename/shuffle patches while grouping them in "features", preparing for upstreaming them to Fuel@OPNFV and beyond. CHANGE: Allow linking patches for better representing the dependency between one patch and different features. e.g. 0001-Add-arch-to-nailgun-release-and-target-image.patch: - part of `multiarch-fuel`, because it extends Fuel; - part of `direct-kernel-boot`, as arch is required for that; - part of `cross-bootstrap`, target image is arch-dependent; NOTE: Patch links are not staged to Fuel@OPNFV, they only serve as markers that a specific patch is part of a feature. CHANGE: Kill all Fuel component submodules, now handled in Fuel@OPNFV: - fuel-agent - fuel-astute - fuel-library - fuel-mirror - fuel-nailgun-agent - fuel-web CHANGE: Move armband-fuel-config.mk to armband git root. FIXME: m1.micro-Increase-profile-RAM-size-to-128MB.patch is NOT part of `cross-bootstrap` feature, but patch context says so ... FIXME: 0001-Add-arm64-deb-repositories-setup.patch is broken at `make patches-export` by removing spaces at EOL. v2 -> v3: * Phony patch support (links to show a patch belongs to a feature); * Updated README.md v3 -> v7: * Re-export Fuel submodules & plugins patches (update patch context); * Update Cavium mail addresses (s/caviumnetworks.com/cavium.com/); * Ignore submodule changes; * Add armband git repo info to gitinfo_fuel.txt at build time; Implements: ARMBAND-136 Closes-bug: ARMBAND-95 Closes-bug: ARMBAND-93 Closes-bug: ARMBAND-92 Change-Id: I1a236d9f43b2e6dca22055911f696b43c22b5973 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'patches/fuel-library/upstream-backports/0001-Set-net.ipv4.ip_nonlocal_bind-1-for-vrouter-namespac.patch')
-rw-r--r--patches/fuel-library/upstream-backports/0001-Set-net.ipv4.ip_nonlocal_bind-1-for-vrouter-namespac.patch54
1 files changed, 54 insertions, 0 deletions
diff --git a/patches/fuel-library/upstream-backports/0001-Set-net.ipv4.ip_nonlocal_bind-1-for-vrouter-namespac.patch b/patches/fuel-library/upstream-backports/0001-Set-net.ipv4.ip_nonlocal_bind-1-for-vrouter-namespac.patch
new file mode 100644
index 00000000..281ef231
--- /dev/null
+++ b/patches/fuel-library/upstream-backports/0001-Set-net.ipv4.ip_nonlocal_bind-1-for-vrouter-namespac.patch
@@ -0,0 +1,54 @@
+From: Bartosz Kupidura <bkupidura@mirantis.com>
+Date: Mon, 27 Jun 2016 13:12:29 +0200
+Subject: [PATCH] Set net.ipv4.ip_nonlocal_bind=1 for vrouter namespace
+
+Change-Id: I123af7e3b53f9a53fcd9d2818640c0bd4699e024
+Closes-Bug: #1595957
+(cherry picked from commit 244456a3b77074a6cd85fa9d33ebb03ac25decf8)
+---
+ files/fuel-ha-utils/ocf/ns_dns | 3 ++-
+ files/fuel-ha-utils/ocf/ns_vrouter | 3 ++-
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/files/fuel-ha-utils/ocf/ns_dns b/files/fuel-ha-utils/ocf/ns_dns
+index cdd814c..49cbd17 100644
+--- a/files/fuel-ha-utils/ocf/ns_dns
++++ b/files/fuel-ha-utils/ocf/ns_dns
+@@ -140,7 +140,7 @@ exit $OCF_SUCCESS
+
+ check_ns() {
+ local ns=`ip netns list | grep "$OCF_RESKEY_ns"`
+- [ $ns != $OCF_RESKEY_ns ] && return $OCF_ERR_GENERIC
++ [ "$ns" != $OCF_RESKEY_ns ] && return $OCF_ERR_GENERIC
+ return $OCF_SUCCESS
+ }
+
+@@ -150,6 +150,7 @@ get_ns() {
+
+ ocf_run ip netns add $OCF_RESKEY_ns
+ rc=$?
++ ocf_run $RUN_IN_NS /sbin/sysctl -w net.ipv4.ip_nonlocal_bind=1
+ ocf_run $RUN_IN_NS ip link set up dev lo
+
+ return $rc
+diff --git a/files/fuel-ha-utils/ocf/ns_vrouter b/files/fuel-ha-utils/ocf/ns_vrouter
+index a65e9cf..5cc6c98 100644
+--- a/files/fuel-ha-utils/ocf/ns_vrouter
++++ b/files/fuel-ha-utils/ocf/ns_vrouter
+@@ -186,7 +186,7 @@ check_ns() {
+ local LH="${LL} check_ns():"
+ local ns=`ip netns list | grep "$OCF_RESKEY_ns"`
+ ocf_log debug "${LH} recieved netns list: ${ns}"
+- [[ $ns != $OCF_RESKEY_ns ]] && return $OCF_ERR_GENERIC
++ [[ "$ns" != $OCF_RESKEY_ns ]] && return $OCF_ERR_GENERIC
+ return $OCF_SUCCESS
+ }
+
+@@ -197,6 +197,7 @@ get_ns() {
+
+ ocf_run ip netns add $OCF_RESKEY_ns
+ rc=$?
++ ocf_run $RUN_IN_NS /sbin/sysctl -w net.ipv4.ip_nonlocal_bind=1
+ ocf_run $RUN_IN_NS ip link set up dev lo
+ ocf_log debug "${LH} added netns ${OCF_RESKEY_ns} and set up lo"
+