1. devstack
  2. Commit 387aadd14e87f2890ad8969c15edbe9f1d218a5a
Browse code

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

Ihar Hrachyshka authored on 2017/09/15 00:25:59
Showing 7 changed files
files/debs/neutron
History View file @ 387aadd
1 1 
deleted file mode 100644
... ... 
@@ -1,17 +0,0 @@
1 
-acl
2 
-dnsmasq-base
3 
-dnsmasq-utils # for dhcp_release only available in dist:precise
4 
-ebtables
5 
-haproxy # to serve as metadata proxy inside router/dhcp namespaces
6 
-iptables
7 
-iputils-arping
8 
-iputils-ping
9 
-libmysqlclient-dev
10 
-mysql-server #NOPRIME
11 
-postgresql-server-dev-all
12 
-python-mysqldb
13 
-rabbitmq-server # NOPRIME
14 
-radvd # NOPRIME
15 
-sqlite3
16 
-sudo
17 
-vlan
files/debs/neutron-common
History View file @ 387aadd
18 1 
new file mode 100644
... ... 
@@ -0,0 +1,17 @@
0 
+acl
1 
+dnsmasq-base
2 
+dnsmasq-utils # for dhcp_release only available in dist:precise
3 
+ebtables
4 
+haproxy # to serve as metadata proxy inside router/dhcp namespaces
5 
+iptables
6 
+iputils-arping
7 
+iputils-ping
8 
+libmysqlclient-dev
9 
+mysql-server #NOPRIME
10 
+postgresql-server-dev-all
11 
+python-mysqldb
12 
+rabbitmq-server # NOPRIME
13 
+radvd # NOPRIME
14 
+sqlite3
15 
+sudo
16 
+vlan
files/rpms-suse/neutron
History View file @ 387aadd
0 17 
deleted file mode 100644
... ... 
@@ -1,13 +0,0 @@
1 
-acl
2 
-dnsmasq
3 
-dnsmasq-utils # dist:opensuse-12.3,opensuse-13.1
4 
-ebtables
5 
-haproxy # to serve as metadata proxy inside router/dhcp namespaces
6 
-iptables
7 
-iputils
8 
-mariadb # NOPRIME
9 
-rabbitmq-server # NOPRIME
10 
-radvd # NOPRIME
11 
-sqlite3
12 
-sudo
13 
-vlan
files/rpms-suse/neutron-common
History View file @ 387aadd
14 1 
new file mode 100644
... ... 
@@ -0,0 +1,13 @@
0 
+acl
1 
+dnsmasq
2 
+dnsmasq-utils # dist:opensuse-12.3,opensuse-13.1
3 
+ebtables
4 
+haproxy # to serve as metadata proxy inside router/dhcp namespaces
5 
+iptables
6 
+iputils
7 
+mariadb # NOPRIME
8 
+rabbitmq-server # NOPRIME
9 
+radvd # NOPRIME
10 
+sqlite3
11 
+sudo
12 
+vlan
files/rpms/neutron
History View file @ 387aadd
0 13 
deleted file mode 100644
... ... 
@@ -1,15 +0,0 @@
1 
-acl
2 
-dnsmasq # for q-dhcp
3 
-dnsmasq-utils # for dhcp_release
4 
-ebtables
5 
-haproxy # to serve as metadata proxy inside router/dhcp namespaces
6 
-iptables
7 
-iputils
8 
-mysql-devel
9 
-MySQL-python
10 
-mysql-server # NOPRIME
11 
-openvswitch # NOPRIME
12 
-rabbitmq-server # NOPRIME
13 
-radvd # NOPRIME
14 
-sqlite
15 
-sudo
files/rpms/neutron-common
History View file @ 387aadd
16 1 
new file mode 100644
... ... 
@@ -0,0 +1,15 @@
0 
+acl
1 
+dnsmasq # for q-dhcp
2 
+dnsmasq-utils # for dhcp_release
3 
+ebtables
4 
+haproxy # to serve as metadata proxy inside router/dhcp namespaces
5 
+iptables
6 
+iputils
7 
+mysql-devel
8 
+MySQL-python
9 
+mysql-server # NOPRIME
10 
+openvswitch # NOPRIME
11 
+rabbitmq-server # NOPRIME
12 
+radvd # NOPRIME
13 
+sqlite
14 
+sudo
functions-common
History View file @ 387aadd
... ... 
@@ -1211,9 +1211,9 @@ function get_packages {
1211 1211 
             if [[ ! $file_to_parse =~ $package_dir/keystone ]]; then
1212 1212 
                 file_to_parse="${file_to_parse} ${package_dir}/keystone"
1213 1213 
             fi
1214 
-        elif [[ $service == q-* ]]; then
1215 
-            if [[ ! $file_to_parse =~ $package_dir/neutron ]]; then
1216 
-                file_to_parse="${file_to_parse} ${package_dir}/neutron"
1214 
+        elif [[ $service == q-* || $service == neutron-* ]]; then
1215 
+            if [[ ! $file_to_parse =~ $package_dir/neutron-common ]]; then
1216 
+                file_to_parse="${file_to_parse} ${package_dir}/neutron-common"
1217 1217 
             fi
1218 1218 
         elif [[ $service == ir-* ]]; then
1219 1219 
             if [[ ! $file_to_parse =~ $package_dir/ironic ]]; then