summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Kajinami <tkajinam@redhat.com>2022-01-02 21:23:10 +0900
committerStephen Finucane <stephenfin@redhat.com>2022-04-05 12:14:24 +0100
commitca8e4dad7f0b5e34f6544ac510d2259afeef1087 (patch)
tree49b9301717c7f4d3e2800169a3aca01774095c58
parentb0851b0e9c82446aec2ea0317514766fbc53abc0 (diff)
downloadnova-ca8e4dad7f0b5e34f6544ac510d2259afeef1087.tar.gz
Sync rootwrap.conf from oslo.rootwrap
The current rootwrap.conf file is outdated and doesn't include some parameters. This change updates the content to make it consistent with the latest example file in oslo.rootwrap. Change-Id: I989b7da5ff6afae0c1a476e01c3df07870be5f74
-rw-r--r--etc/nova/rootwrap.conf6
-rw-r--r--lower-constraints.txt2
-rw-r--r--requirements.txt2
3 files changed, 8 insertions, 2 deletions
diff --git a/etc/nova/rootwrap.conf b/etc/nova/rootwrap.conf
index c6fd5642b7..25eddbd032 100644
--- a/etc/nova/rootwrap.conf
+++ b/etc/nova/rootwrap.conf
@@ -25,3 +25,9 @@ syslog_log_facility=syslog
# INFO means log all usage
# ERROR means only log unsuccessful attempts
syslog_log_level=ERROR
+
+# Rootwrap daemon exits after this seconds of inactivity
+daemon_timeout=600
+
+# Rootwrap daemon limits itself to that many file descriptors (Linux only)
+rlimit_nofile=1024
diff --git a/lower-constraints.txt b/lower-constraints.txt
index 93e757994e..e27e4f81af 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -79,7 +79,7 @@ oslo.middleware==3.31.0
oslo.policy==3.7.0
oslo.privsep==2.6.2
oslo.reports==1.18.0
-oslo.rootwrap==5.8.0
+oslo.rootwrap==5.15.0
oslo.serialization==4.2.0
oslo.service==2.8.0
oslo.upgradecheck==1.3.0
diff --git a/requirements.txt b/requirements.txt
index 1a83a0813a..f5248d03e0 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -37,7 +37,7 @@ oslo.serialization>=4.2.0 # Apache-2.0
oslo.upgradecheck>=1.3.0
oslo.utils>=4.12.1 # Apache-2.0
oslo.db>=10.0.0 # Apache-2.0
-oslo.rootwrap>=5.8.0 # Apache-2.0
+oslo.rootwrap>=5.15.0 # Apache-2.0
oslo.messaging>=10.3.0 # Apache-2.0
oslo.policy>=3.7.0 # Apache-2.0
oslo.privsep>=2.6.2 # Apache-2.0