openstack/ironic
Code Issues Proposed changes

Drop rootwrap.d/ironic-lib.filters file

Browse Source 
The file is included in the ironic-lib module and there is no
difference (beside some comments) in the files.

For packagers, this solves the problem that ironic-lib and ironic are
currently not installable together given that both packages contain
the same file.

Story: 2006604
Task: 36772
Depends-On: https://review.opendev.org/684771
Change-Id: I2d800d4c2616ccd9d9f12a2fe59e259def15dc6b
This commit is contained in:
Thomas Bechtold 2019-09-24 12:12:35 +02:00 committed by Jacek Tomasiak
parent 443e0b1093
commit bfb41571b2
3 changed files with 17 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
devstack/lib/ironic
View File

@ -1425,6 +1425,17 @@ function configure_ironic_conductor {
configure_rootwrap ironic
# additional rootwrap config from ironic-lib
local ironic_lib_prefix
if use_library_from_git "ironic-lib"; then
ironic_lib_prefix=${GITDIR["ironic-lib"]}
else
# pip uses default python 'data' path
ironic_lib_prefix=$(python -c "import sysconfig; \
print(sysconfig.get_path('data'))")
fi
sudo install -o root -g root -m 644 $ironic_lib_prefix/etc/ironic/rootwrap.d/*.filters /etc/ironic/rootwrap.d
# set up drivers / hardware types
iniset $IRONIC_CONF_FILE DEFAULT enabled_hardware_types $IRONIC_ENABLED_HARDWARE_TYPES

28
etc/ironic/rootwrap.d/ironic-lib.filters
View File

@ -1,28 +0,0 @@
# An ironic-lib.filters to be used with rootwrap command.
# The following commands should be used in filters for disk manipulation.
# This file should be owned by (and only-writable by) the root user.
# NOTE: this file is a copy of ironic-lib.filters from the ironic-lib
# repository that should ultimately be remove. At this point, we still
# need it to avoid gate breakage and preserve compatibily with existing
# installation.
[Filters]
# ironic_lib/disk_utils.py
blkid: CommandFilter, blkid, root
blockdev: CommandFilter, blockdev, root
hexdump: CommandFilter, hexdump, root
lsblk: CommandFilter, lsblk, root
qemu-img: CommandFilter, qemu-img, root
wipefs: CommandFilter, wipefs, root
sgdisk: CommandFilter, sgdisk, root
partprobe: CommandFilter, partprobe, root
# ironic_lib/utils.py
mkswap: CommandFilter, mkswap, root
mkfs: CommandFilter, mkfs, root
dd: CommandFilter, dd, root
# ironic_lib/disk_partitioner.py
fuser: CommandFilter, fuser, root
parted: CommandFilter, parted, root

6
releasenotes/notes/drop-ironic-lib-rootwrap-filters-f9224173289c1e30.yaml Normal file
View File

@ -0,0 +1,6 @@
---
other:
- |
The rootwrap filter file called "ironic-lib.filters" is no longer part
of Ironic. The same file is available from the ironic-lib module which is
already an install requirement.