From ca8e4dad7f0b5e34f6544ac510d2259afeef1087 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Sun, 2 Jan 2022 21:23:10 +0900 Subject: [PATCH] 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 --- etc/nova/rootwrap.conf | 6 ++++++ lower-constraints.txt | 2 +- requirements.txt | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/etc/nova/rootwrap.conf b/etc/nova/rootwrap.conf index c6fd5642b7bd..25eddbd032bb 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 93e757994e25..e27e4f81afa1 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 1a83a0813a4a..f5248d03e0b5 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