diff options
| -rw-r--r-- | INFO | 6 | ||||
| -rw-r--r-- | patches/fuel-agent/0011-target-Ubuntu-Blacklist-rtc-efi-if-not-supported.patch (renamed from patches/fuel-agent/0010-target-Ubuntu-Blacklist-rtc-efi-if-not-supported.patch) | 0 | ||||
| -rw-r--r-- | patches/fuel-astute/0001-Increase-maximum-shell-command-timeout-to-2h.patch (renamed from patches/fuel-astute/0001-Increase-maximum-shell-command-timeout.patch) | 0 | ||||
| -rw-r--r-- | patches/fuel-plugin-opendaylight/0002-Increase-open-file-limit-for-OpenDaylight.patch | 31 | ||||
| -rw-r--r-- | patches/fuel-web/0005-FIXME-Disable-amd64-Liberty-on-Ubuntu-for-now.patch | 2 | ||||
| -rw-r--r-- | patches/fuel-web/0006-Add-configuration-item-for-WSREP-SST-provider.patch | 2 |
6 files changed, 36 insertions, 5 deletions
@@ -10,13 +10,13 @@ mailing list tag [armband] Committers: Bob Monkman (bob.monkman@arm.com) Rob Dimond (robert.dimond@arm.com) -Jerin Jacob (Jerin.Jacob@caviumnetworks.com) -Vinita Gupta (Vinita.Gupta@caviumnetworks.com) +Jerin Jacob (Jerin.Jacob@cavium.com) +Vinita Gupta (Vinita.Gupta@cavium.com) Santosh Shukla (sshukla@mvista.com) Joe Kidder (joe.kidder@enea.com) Bin Hu (bh526r@att.com) Aiguo Cui (ag.cui@huawei.com) -Stanislaw Kardach (Stanislaw.Kardach@caviumnetworks.com) +Stanislaw Kardach (Stanislaw.Kardach@cavium.com) Josep Puigdemont (josep.puigdemont@enea.com) Ciprian Barbu (Ciprian.Barbu@enea.com) Florin Dumitrascu (florin.dumitrascu@enea.com) diff --git a/patches/fuel-agent/0010-target-Ubuntu-Blacklist-rtc-efi-if-not-supported.patch b/patches/fuel-agent/0011-target-Ubuntu-Blacklist-rtc-efi-if-not-supported.patch index b0c32f4f..b0c32f4f 100644 --- a/patches/fuel-agent/0010-target-Ubuntu-Blacklist-rtc-efi-if-not-supported.patch +++ b/patches/fuel-agent/0011-target-Ubuntu-Blacklist-rtc-efi-if-not-supported.patch diff --git a/patches/fuel-astute/0001-Increase-maximum-shell-command-timeout.patch b/patches/fuel-astute/0001-Increase-maximum-shell-command-timeout-to-2h.patch index d7048954..d7048954 100644 --- a/patches/fuel-astute/0001-Increase-maximum-shell-command-timeout.patch +++ b/patches/fuel-astute/0001-Increase-maximum-shell-command-timeout-to-2h.patch 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 new file mode 100644 index 00000000..be7658ee --- /dev/null +++ b/patches/fuel-plugin-opendaylight/0002-Increase-open-file-limit-for-OpenDaylight.patch @@ -0,0 +1,31 @@ +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 diff --git a/patches/fuel-web/0005-FIXME-Disable-amd64-Liberty-on-Ubuntu-for-now.patch b/patches/fuel-web/0005-FIXME-Disable-amd64-Liberty-on-Ubuntu-for-now.patch index 243d9c85..da231cb4 100644 --- a/patches/fuel-web/0005-FIXME-Disable-amd64-Liberty-on-Ubuntu-for-now.patch +++ b/patches/fuel-web/0005-FIXME-Disable-amd64-Liberty-on-Ubuntu-for-now.patch @@ -11,7 +11,7 @@ TODO: maybe rename above fixture to include arch in name. 1 file changed, 1 insertion(+) diff --git a/nailgun/nailgun/fixtures/openstack.yaml b/nailgun/nailgun/fixtures/openstack.yaml -index 4979fb5..037ceba 100644 +index 9da1346..f798830 100644 --- a/nailgun/nailgun/fixtures/openstack.yaml +++ b/nailgun/nailgun/fixtures/openstack.yaml @@ -1986,6 +1986,7 @@ diff --git a/patches/fuel-web/0006-Add-configuration-item-for-WSREP-SST-provider.patch b/patches/fuel-web/0006-Add-configuration-item-for-WSREP-SST-provider.patch index dacb26de..dc6c4b3e 100644 --- a/patches/fuel-web/0006-Add-configuration-item-for-WSREP-SST-provider.patch +++ b/patches/fuel-web/0006-Add-configuration-item-for-WSREP-SST-provider.patch @@ -12,7 +12,7 @@ Signed-off-by: Stanislaw Kardach <stanislaw.kardach@caviumnetworks.com> 1 file changed, 21 insertions(+) diff --git a/nailgun/nailgun/fixtures/openstack.yaml b/nailgun/nailgun/fixtures/openstack.yaml -index 037ceba..598cf77 100644 +index f798830..c99e91a 100644 --- a/nailgun/nailgun/fixtures/openstack.yaml +++ b/nailgun/nailgun/fixtures/openstack.yaml @@ -856,6 +856,27 @@ |