openstack/devstack
Code Issues Proposed changes

Add a dependency file for os-brick (and add lsscsi)

Browse Source 
There are a few dependencies which are really os-brick-specific.
They are listed in its bindep.txt file, but os-brick is usually
installed from pip, so its bindep.txt file is not available.

As those dependencies are needed by the various services
which use os-brick, move them to their own dependency file
(with the addition of the new lsscsi, required by the next
os-brick stable release) and make sure that file is parsed
when installing the services which require os-brick.

Side note: there should be a way to avoid this duplication
also for pip-installed libraries (normal services can use
files/ or even bindep, but in this case the source is not always
available), (temporarily?) duplicate them, as it has been
the case for the other os-brick dependencies already listed here.

Change-Id: I9ab6e215dbef9ebdb1946da2f9a40ce020ecc95b
This commit is contained in:
Luigi Toscano 2020-08-13 09:55:08 +02:00
parent 647fef0b40
commit 52e52d8937
7 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
files/debs/cinder
View File

@ -1,6 +1,4 @@
lvm2 lvm2
open-iscsi
open-iscsi-utils # Deprecated since quantal dist:precise
qemu-utils qemu-utils
tgt # NOPRIME tgt # NOPRIME
thin-provisioning-tools thin-provisioning-tools

3
files/debs/os-brick Normal file
View File

@ -0,0 +1,3 @@
lsscsi
open-iscsi
open-iscsi-utils # Deprecated since quantal dist:precise

1
files/rpms-suse/cinder
View File

@ -1,4 +1,3 @@
lvm2 lvm2
open-iscsi
qemu-tools qemu-tools
tgt # NOPRIME tgt # NOPRIME

2
files/rpms-suse/os-brick Normal file
View File

@ -0,0 +1,2 @@
lsscsi
open-iscsi

1
files/rpms/cinder
View File

@ -1,4 +1,3 @@
iscsi-initiator-utils
lvm2 lvm2
qemu-img qemu-img
targetcli targetcli

2
files/rpms/os-brick Normal file
View File

@ -0,0 +1,2 @@
iscsi-initiator-utils
lsscsi

9
functions-common
View File

@ -1219,10 +1219,16 @@ function get_packages {
if [[ ! $file_to_parse =~ $package_dir/glance ]]; then if [[ ! $file_to_parse =~ $package_dir/glance ]]; then
file_to_parse="${file_to_parse} ${package_dir}/glance" file_to_parse="${file_to_parse} ${package_dir}/glance"
fi fi
if [[ ! $file_to_parse =~ $package_dir/os-brick ]]; then
file_to_parse="${file_to_parse} ${package_dir}/os-brick"
fi
elif [[ $service == c-* ]]; then elif [[ $service == c-* ]]; then
if [[ ! $file_to_parse =~ $package_dir/cinder ]]; then if [[ ! $file_to_parse =~ $package_dir/cinder ]]; then
file_to_parse="${file_to_parse} ${package_dir}/cinder" file_to_parse="${file_to_parse} ${package_dir}/cinder"
fi fi
if [[ ! $file_to_parse =~ $package_dir/os-brick ]]; then
file_to_parse="${file_to_parse} ${package_dir}/os-brick"
fi
elif [[ $service == s-* ]]; then elif [[ $service == s-* ]]; then
if [[ ! $file_to_parse =~ $package_dir/swift ]]; then if [[ ! $file_to_parse =~ $package_dir/swift ]]; then
file_to_parse="${file_to_parse} ${package_dir}/swift" file_to_parse="${file_to_parse} ${package_dir}/swift"
@ -1231,6 +1237,9 @@ function get_packages {
if [[ ! $file_to_parse =~ $package_dir/nova ]]; then if [[ ! $file_to_parse =~ $package_dir/nova ]]; then
file_to_parse="${file_to_parse} ${package_dir}/nova" file_to_parse="${file_to_parse} ${package_dir}/nova"
fi fi
if [[ ! $file_to_parse =~ $package_dir/os-brick ]]; then
file_to_parse="${file_to_parse} ${package_dir}/os-brick"
fi
elif [[ $service == g-* ]]; then elif [[ $service == g-* ]]; then
if [[ ! $file_to_parse =~ $package_dir/glance ]]; then if [[ ! $file_to_parse =~ $package_dir/glance ]]; then
file_to_parse="${file_to_parse} ${package_dir}/glance" file_to_parse="${file_to_parse} ${package_dir}/glance"