diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-05-31 22:45:50 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-06-01 17:38:15 +0200 |
| commit | a3e2df1ffc43d3ed4854a3b02bf46a588d683227 (patch) | |
| tree | 539b1cad579ec8de07d16d8e90b1053a031c6d70 | |
| parent | 81682e66fc46cdd5aeede20e2c22d7da6df25784 (diff) | |
Upstream: ODL file limit patch was merged upstream
See upstream commit [1].
[1] https://github.com/openstack/fuel-plugin-opendaylight/
commit/5012455d58ddfda5894130ca14d8fb7d6b4c8b60
| -rw-r--r-- | patches/fuel-plugin-opendaylight/0002-Increase-open-file-limit-for-OpenDaylight.patch | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/patches/fuel-plugin-opendaylight/0002-Increase-open-file-limit-for-OpenDaylight.patch b/patches/fuel-plugin-opendaylight/0002-Increase-open-file-limit-for-OpenDaylight.patch deleted file mode 100644 index be7658ee..00000000 --- a/patches/fuel-plugin-opendaylight/0002-Increase-open-file-limit-for-OpenDaylight.patch +++ /dev/null @@ -1,31 +0,0 @@ -From: Stanislaw Kardach <stanislaw.kardach@cavium.com> -Date: Sat, 14 May 2016 17:24:48 -0700 -Subject: [PATCH] Increase open file limit for OpenDaylight - -Upstart scripts by default do not run scripts in a shell which results -in limits from `/etc/security/limits.conf` not be taken into account -and results in the default value (4096) to be taken. This may prove -problematic for OpenDaylight during initialization. On Cavium ThunderX -we have noticed OpenFlow controller initialization failures caused by -hitting this limit. -OPNFV is increasing the `nofile` limit to 112640 for OpenStack services -which is why I'm using this value here. - -Signed-off-by: Stanislaw Kardach <stanislaw.kardach@cavium.com> ---- - odl_package/ubuntu/opendaylight | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/odl_package/ubuntu/opendaylight b/odl_package/ubuntu/opendaylight -index 6e5ff7b..52a3159 100644 ---- a/odl_package/ubuntu/opendaylight -+++ b/odl_package/ubuntu/opendaylight -@@ -14,7 +14,7 @@ env JAVA_OPTS="-server -Xms256M -Xmx2048M -XX:+UnlockDiagnosticVMOptions -XX:+Un - env OPTS="-Dkaraf.startLocalConsole=false -Dkaraf.startRemoteShell=true" - env MAIN="org.apache.karaf.main.Main" - -- -+limit nofile 102400 112640 - chdir /opt/opendaylight - - script |