Add a dependency file for os-brick (and add lsscsi)
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
Luigi Toscano authored on 2020/08/13 16:55:08Showing 7 changed files
- files/debs/cinder
- files/debs/os-brick
- files/rpms-suse/cinder
- files/rpms-suse/os-brick
- files/rpms/cinder
- files/rpms/os-brick
- functions-common
| ... | ... |
@@ -1219,10 +1219,16 @@ function get_packages {
|
| 1219 | 1219 |
if [[ ! $file_to_parse =~ $package_dir/glance ]]; then |
| 1220 | 1220 |
file_to_parse="${file_to_parse} ${package_dir}/glance"
|
| 1221 | 1221 |
fi |
| 1222 |
+ if [[ ! $file_to_parse =~ $package_dir/os-brick ]]; then |
|
| 1223 |
+ file_to_parse="${file_to_parse} ${package_dir}/os-brick"
|
|
| 1224 |
+ fi |
|
| 1222 | 1225 |
elif [[ $service == c-* ]]; then |
| 1223 | 1226 |
if [[ ! $file_to_parse =~ $package_dir/cinder ]]; then |
| 1224 | 1227 |
file_to_parse="${file_to_parse} ${package_dir}/cinder"
|
| 1225 | 1228 |
fi |
| 1229 |
+ if [[ ! $file_to_parse =~ $package_dir/os-brick ]]; then |
|
| 1230 |
+ file_to_parse="${file_to_parse} ${package_dir}/os-brick"
|
|
| 1231 |
+ fi |
|
| 1226 | 1232 |
elif [[ $service == s-* ]]; then |
| 1227 | 1233 |
if [[ ! $file_to_parse =~ $package_dir/swift ]]; then |
| 1228 | 1234 |
file_to_parse="${file_to_parse} ${package_dir}/swift"
|
| ... | ... |
@@ -1231,6 +1237,9 @@ function get_packages {
|
| 1231 | 1231 |
if [[ ! $file_to_parse =~ $package_dir/nova ]]; then |
| 1232 | 1232 |
file_to_parse="${file_to_parse} ${package_dir}/nova"
|
| 1233 | 1233 |
fi |
| 1234 |
+ if [[ ! $file_to_parse =~ $package_dir/os-brick ]]; then |
|
| 1235 |
+ file_to_parse="${file_to_parse} ${package_dir}/os-brick"
|
|
| 1236 |
+ fi |
|
| 1234 | 1237 |
elif [[ $service == g-* ]]; then |
| 1235 | 1238 |
if [[ ! $file_to_parse =~ $package_dir/glance ]]; then |
| 1236 | 1239 |
file_to_parse="${file_to_parse} ${package_dir}/glance"
|