commit 387aadd14e87f2890ad8969c15edbe9f1d218a5a
author Ihar Hrachyshka <ihrachys@redhat.com> Thu Sep 14 09:25:59 2017 -0600
committer Ihar Hrachyshka <ihrachys@redhat.com> Thu Sep 14 12:37:27 2017 -0600
tree 203d35a98c0febb4e3327252cba2c1fc9d298446
parent 71e07c738d33ba2772c42c21f4db38032f2e17be

Install neutron rpms/debs when lib/neutron is used

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

functions-common

diff --git a/functions-common b/functions-common
index deebdec..33639c5 100644
--- a/functions-common
+++ b/functions-common
@@ -1211,9 +1211,9 @@
             if [[ ! $file_to_parse =~ $package_dir/keystone ]]; then
                 file_to_parse="${file_to_parse} ${package_dir}/keystone"
             fi
-        elif [[ $service == q-* ]]; then
-            if [[ ! $file_to_parse =~ $package_dir/neutron ]]; then
-                file_to_parse="${file_to_parse} ${package_dir}/neutron"
+        elif [[ $service == q-* || $service == neutron-* ]]; then
+            if [[ ! $file_to_parse =~ $package_dir/neutron-common ]]; then
+                file_to_parse="${file_to_parse} ${package_dir}/neutron-common"
             fi
         elif [[ $service == ir-* ]]; then
             if [[ ! $file_to_parse =~ $package_dir/ironic ]]; then