From 1a332836df4352f45d29b1eb80bd06e48222a9a0 Mon Sep 17 00:00:00 2001
From: Maru Newby <marun@redhat.com>
Date: Mon, 28 Jul 2014 22:31:14 +0000
Subject: [PATCH] Add mysql devel as testonly alongside mysql-server

Neutron needs to be able to install MySQL-python in the functional
test job, which requires devstack to install mysql devel libraries as
testonly.

As per sdague's recommendation mysql devel libraries are now installed
for nova as well.  In the future, any service that installs
mysql-server should also install mysql devel libraries for consistency.

Related-bug: #1346444

Change-Id: Ie715841e33a2c2d31cb4ac724b302eb98ed3366a
---
 files/apts/neutron | 1 +
 files/apts/nova    | 1 +
 files/rpms/neutron | 1 +
 files/rpms/nova    | 1 +
 4 files changed, 4 insertions(+)

diff --git a/files/apts/neutron b/files/apts/neutron
index d3a08c77a1..23dd65bc56 100644
--- a/files/apts/neutron
+++ b/files/apts/neutron
@@ -2,6 +2,7 @@ ebtables
 iptables
 iputils-ping
 iputils-arping
+libmysqlclient-dev  # testonly
 mysql-server #NOPRIME
 sudo
 python-boto
diff --git a/files/apts/nova b/files/apts/nova
index 090ca4d48d..114194e9d7 100644
--- a/files/apts/nova
+++ b/files/apts/nova
@@ -4,6 +4,7 @@ conntrack
 kpartx
 parted
 iputils-arping
+libmysqlclient-dev  # testonly
 mysql-server # NOPRIME
 python-mysqldb
 python-mysql.connector
diff --git a/files/rpms/neutron b/files/rpms/neutron
index aaff48ae4c..c56e6e2322 100644
--- a/files/rpms/neutron
+++ b/files/rpms/neutron
@@ -5,6 +5,7 @@ ebtables
 iptables
 iputils
 mysql-connector-python
+mysql-devel  # testonly
 mysql-server # NOPRIME
 openvswitch # NOPRIME
 python-boto
diff --git a/files/rpms/nova b/files/rpms/nova
index ccee8a73b1..4c2ee5762b 100644
--- a/files/rpms/nova
+++ b/files/rpms/nova
@@ -16,6 +16,7 @@ libxml2-python
 numpy # needed by websockify for spice console
 m2crypto
 mysql-connector-python
+mysql-devel  # testonly
 mysql-server # NOPRIME
 parted
 polkit