openstack/devstack
Code Issues Proposed changes

Install neutron rpms/debs when lib/neutron is used

Browse Source 
lib/neutron service prefixes are neutron-* not q-*. We should install
those packages either way.

The patch moves files/*/neutron into files/*/neutron-common so that we
can correctly match */neutron against service specific dependency files
(f.e. */neutron-agent) and load the common packages if any neutron-*
service is present.

Change-Id: I57b36f2ed3f33737223a35d9ed734bb414f31e0b
This commit is contained in:
Ihar Hrachyshka 2017-09-14 09:25:59 -06:00
parent 71e07c738d
commit 387aadd14e
4 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
files/debs/neutron → files/debs/neutron-common
View File

0
files/rpms-suse/neutron → files/rpms-suse/neutron-common
View File

0
files/rpms/neutron → files/rpms/neutron-common
View File

6
functions-common
View File

@ -1211,9 +1211,9 @@ function get_packages {
if [[ ! $file_to_parse =~ $package_dir/keystone ]]; then if [[ ! $file_to_parse =~ $package_dir/keystone ]]; then
file_to_parse="${file_to_parse} ${package_dir}/keystone" file_to_parse="${file_to_parse} ${package_dir}/keystone"
fi fi
elif [[ $service == q-* ]]; then elif [[ $service == q-* || $service == neutron-* ]]; then
if [[ ! $file_to_parse =~ $package_dir/neutron ]]; then if [[ ! $file_to_parse =~ $package_dir/neutron-common ]]; then
file_to_parse="${file_to_parse} ${package_dir}/neutron" file_to_parse="${file_to_parse} ${package_dir}/neutron-common"
fi fi
elif [[ $service == ir-* ]]; then elif [[ $service == ir-* ]]; then
if [[ ! $file_to_parse =~ $package_dir/ironic ]]; then if [[ ! $file_to_parse =~ $package_dir/ironic ]]; then