openstack/ironic
Code Issues Proposed changes

Support centos 7 rootwrap data directory

Browse Source 
Centos 7 pip seems to install the rootwrap filters to /usr/local
despite its data path resolving to /usr.

Change-Id: If2496e9c143400dcce017a79cf179768951eb137
This commit is contained in:
michaeltchapman
2020-03-19 01:34:50 +11:00
parent 8a2866f25f
commit bee537a4a3
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
devstack/lib/ironic
View File

@@ -1433,6 +1433,11 @@ function configure_ironic_conductor {
# pip uses default python 'data' path # pip uses default python 'data' path
ironic_lib_prefix=$(python -c "import sysconfig; \ ironic_lib_prefix=$(python -c "import sysconfig; \
print(sysconfig.get_path('data'))") print(sysconfig.get_path('data'))")
# on Centos7 the data is installed to /usr/local
if [ ! -d $ironic_lib_prefix/etc/ironic/rootwrap.d ]; then
ironic_lib_prefix=/usr/local
fi
fi fi
sudo install -o root -g root -m 644 $ironic_lib_prefix/etc/ironic/rootwrap.d/*.filters /etc/ironic/rootwrap.d sudo install -o root -g root -m 644 $ironic_lib_prefix/etc/ironic/rootwrap.d/*.filters /etc/ironic/rootwrap.d