Skip to content

Commit

Permalink
Drop rootwrap.d/ironic-lib.filters file
Browse files Browse the repository at this point in the history
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
  • Loading branch information
toabctl authored and skazi0 committed Mar 16, 2020
1 parent 443e0b1 commit bfb4157
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 28 deletions.
11 changes: 11 additions & 0 deletions devstack/lib/ironic
Expand Up @@ -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

Expand Down
28 changes: 0 additions & 28 deletions etc/ironic/rootwrap.d/ironic-lib.filters

This file was deleted.

@@ -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.

0 comments on commit bfb4157

Please sign in to comment.