From eee92f5eaf96c945bedb77e55b09167b41ee2e9e Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Sun, 2 Jan 2022 21:22:22 +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: I0b40b0bea4bbcbc78490dbfa3877cdd3a26ac298 --- etc/rootwrap.conf | 3 +++ lower-constraints.txt | 2 +- requirements.txt | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/etc/rootwrap.conf b/etc/rootwrap.conf index b82fc7d83eb..4e1ea03659c 100644 --- a/etc/rootwrap.conf +++ b/etc/rootwrap.conf @@ -28,3 +28,6 @@ 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 a4889e8d6a1..c8999945d35 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -70,7 +70,7 @@ oslo.middleware==3.31.0 oslo.policy==3.7.0 oslo.privsep==2.3.0 oslo.reports==1.18.0 -oslo.rootwrap==5.8.0 +oslo.rootwrap==5.15.0 oslo.serialization==2.25.0 oslo.service==1.31.0 oslo.upgradecheck==1.3.0 diff --git a/requirements.txt b/requirements.txt index 9b9551740ad..808b78d1912 100644 --- a/requirements.txt +++ b/requirements.txt @@ -36,7 +36,7 @@ oslo.middleware>=3.31.0 # Apache-2.0 oslo.policy>=3.7.0 # Apache-2.0 oslo.privsep>=2.3.0 # Apache-2.0 oslo.reports>=1.18.0 # Apache-2.0 -oslo.rootwrap>=5.8.0 # Apache-2.0 +oslo.rootwrap>=5.15.0 # Apache-2.0 oslo.serialization>=2.25.0 # Apache-2.0 oslo.service>=1.31.0 # Apache-2.0 oslo.upgradecheck>=1.3.0 # Apache-2.0