diff --git a/etc/ironic/rootwrap.conf b/etc/ironic/rootwrap.conf deleted file mode 100644 index 607d59b4ae..0000000000 --- a/etc/ironic/rootwrap.conf +++ /dev/null @@ -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 diff --git a/etc/ironic/rootwrap.d/ironic-utils.filters b/etc/ironic/rootwrap.d/ironic-utils.filters deleted file mode 100644 index 3166b22b45..0000000000 --- a/etc/ironic/rootwrap.d/ironic-utils.filters +++ /dev/null @@ -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. diff --git a/releasenotes/notes/remove-rootwrap-575dd46a25bbfc37.yaml b/releasenotes/notes/remove-rootwrap-575dd46a25bbfc37.yaml new file mode 100644 index 0000000000..4cea57f8d7 --- /dev/null +++ b/releasenotes/notes/remove-rootwrap-575dd46a25bbfc37.yaml @@ -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 diff --git a/requirements.txt b/requirements.txt index d18249b4e7..13154e76c2 100644 --- a/requirements.txt +++ b/requirements.txt @@ -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 diff --git a/setup.cfg b/setup.cfg index b320607f25..7b85259c8a 100644 --- a/setup.cfg +++ b/setup.cfg @@ -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