Remove rootwrap

Ironic no longer uses rootwrap since iscsi deploy was removed. See [1]
for details.

Remove the config files and the command for rootwrap because these are
useless. We can remove these from the repository first to force distros
get rid of these.

[1] be09717be2

Change-Id: I0a8e26e8990eae8108537541159f7810d35b70f1
Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>
This commit is contained in:
Takashi Kajinami 2025-06-26 16:49:18 +09:00
parent e5ee70d3dc
commit 489af188c0
5 changed files with 9 additions and 38 deletions

View file

@ -1,28 +0,0 @@
# Configuration for ironic-rootwrap
# This file should be owned by (and only writable by) the root user
# DEPRECATED for removal: Ironic no longer needs root.
[DEFAULT]
# List of directories to load filter definitions from (separated by ',').
# These directories MUST all be only writable by root !
filters_path=/etc/ironic/rootwrap.d,/usr/share/ironic/rootwrap
# List of directories to search executables in, in case filters do not
# explicitly specify a full path (separated by ',')
# If not specified, defaults to system PATH environment variable.
# These directories MUST all be only writable by root !
exec_dirs=/sbin,/usr/sbin,/bin,/usr/bin
# Enable logging to syslog
# Default value is False
use_syslog=False
# Which syslog facility to use.
# Valid values include auth, authpriv, syslog, user0, user1...
# Default value is 'syslog'
syslog_log_facility=syslog
# Which messages to log.
# INFO means log all usage
# ERROR means only log unsuccessful attempts
syslog_log_level=ERROR

View file

@ -1,3 +0,0 @@
# ironic-rootwrap command filters for disk manipulation
# This file should be owned by (and only-writable by) the root user
# DEPRECATED for removal: Ironic no longer needs root.

View file

@ -0,0 +1,9 @@
---
upgrade:
- |
Rootwrap support has been removed. Due to this removal, the following files
and directories are no longer used, and should be removed.
- ``/etc/ironic/rootwrap.conf`` file
- ``/etc/ironic/rootwrap.d`` directory
- ``ironic-rootwrap`` command

View file

@ -14,8 +14,6 @@ oslo.concurrency>=4.2.0 # Apache-2.0
oslo.config>=6.8.0 # Apache-2.0
oslo.context>=2.22.0 # Apache-2.0
oslo.db>=9.1.0 # Apache-2.0
# TODO(dtantsur): remove rootwrap when we no longer provide ironic-rootwrap CLI
oslo.rootwrap>=5.8.0 # Apache-2.0
oslo.log>=4.3.0 # Apache-2.0
oslo.middleware>=3.31.0 # Apache-2.0
oslo.policy>=4.5.0 # Apache-2.0

View file

@ -22,11 +22,7 @@ classifier =
Programming Language :: Python :: 3.12
[files]
# TODO(dtantsur): remove rootwrap files after the packagers drop them.
data_files =
etc/ironic =
etc/ironic/rootwrap.conf
etc/ironic/rootwrap.d = etc/ironic/rootwrap.d/*
share/ironic/vnc-container = tools/vnc-container/*
packages =
ironic
@ -50,7 +46,6 @@ console_scripts =
ironic-dbsync = ironic.command.dbsync:main
ironic-conductor = ironic.command.conductor:main
ironic-novncproxy = ironic.command.novncproxy:main
ironic-rootwrap = oslo_rootwrap.cmd:main
ironic-status = ironic.command.status:main
ironic-pxe-filter = ironic.command.pxe_filter:main