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
This commit is contained in:
7 changed files with 16 additions and 4 deletions
@@ -1219,10 +1219,16 @@ function get_packages {
if [[ ! $file_to_parse =~ $package_dir/glance ]]; then
file_to_parse="${file_to_parse} ${package_dir}/glance"
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
if [[ ! $file_to_parse =~ $package_dir/cinder ]]; then
file_to_parse="${file_to_parse} ${package_dir}/cinder"
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
if [[ ! $file_to_parse =~ $package_dir/swift ]]; then
file_to_parse="${file_to_parse} ${package_dir}/swift"
@@ -1231,6 +1237,9 @@ function get_packages {
if [[ ! $file_to_parse =~ $package_dir/nova ]]; then
file_to_parse="${file_to_parse} ${package_dir}/nova"
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
if [[ ! $file_to_parse =~ $package_dir/glance ]]; then
file_to_parse="${file_to_parse} ${package_dir}/glance"
Reference in New Issue
Block a user
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.