From c620603dc89c5fecdbfc69944fcf30ebb574add7 Mon Sep 17 00:00:00 2001
From: Igor Yozhikov <iyozhikov@mirantis.com>
Date: Tue, 11 Nov 2014 14:03:24 +0300
Subject: [PATCH] Add requirements

* python-osprofiler
* python-oslo-middleware
* python-oslo-serialization
* python-oslo-utils
* add extra startup logging from runtests.sh
Change-Id: Ia9cb1261bc141d21b1f5ff236faad9ecd1dbbd6b
---
 rpm/SPECS/openstack-heat.spec |  7 ++++++-
 tests/runtests.sh             | 15 +++++++--------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/rpm/SPECS/openstack-heat.spec b/rpm/SPECS/openstack-heat.spec
index 2ef434d4..bca6b9c5 100644
--- a/rpm/SPECS/openstack-heat.spec
+++ b/rpm/SPECS/openstack-heat.spec
@@ -57,7 +57,8 @@ BuildRequires: python-paste-deploy >= 1.5.0
 BuildRequires: python-routes >= 1.12.3, python-routes < 2.0
 BuildRequires: python-sqlalchemy >= 0.8.4, python-sqlalchemy <= 0.9.99
 BuildRequires: python-webob >= 1.2.3
-
+BuildRequires: python-osprofiler
+BuildRequires: python-oslo-middleware
 BuildRequires: python-pbr
 BuildRequires: python-d2to1
 %if 0%{?with_doc}
@@ -210,6 +211,10 @@ Requires: m2crypto
 Requires: python-anyjson
 Requires: python-paramiko >= 1.13.0
 Requires: MySQL-python
+Requires: python-osprofiler >= 0.3.0
+Requires: python-oslo-middleware >= 0.1.0
+Requires: python-oslo-serialization >= 1.0.0
+Requires: python-oslo-utils >= 1.0.0
 Requires(pre): shadow-utils
 
 %description common
diff --git a/tests/runtests.sh b/tests/runtests.sh
index e3428037..a44db8ba 100755
--- a/tests/runtests.sh
+++ b/tests/runtests.sh
@@ -9,12 +9,11 @@ prepare_vm() {
    then
       echo "mysql-server mysql-server/root_password select $MYSQL_PASSWORD" | sudo debconf-set-selections
       echo "mysql-server mysql-server/root_password_again select $MYSQL_PASSWORD" | sudo debconf-set-selections
-      apt-get install -y mysql-server python-mysqldb rabbitmq-server
+      apt-get install -y mysql-server mysql-client python-mysqldb rabbitmq-server
    else
-      yum install screen mysql-server MySQL-python rabbitmq-server -y
-      service mysqld start
+      yum install screen mysql-server MySQL-python MySQL-client rabbitmq-server -y
+      service $(chkconfig | grep -oE '^mysql.?\s') start
       /usr/bin/mysqladmin -u root password $MYSQL_PASSWORD
-      /usr/bin/mysqladmin -u root --password=$MYSQL_PASSWORD  -h localhost $MYSQL_PASSWORD
    fi
    service rabbitmq-server start
    mysql -uroot -p$MYSQL_PASSWORD -Bse "create database heat"
@@ -71,7 +70,7 @@ case $package in
         screen -dmS heat-api
         sleep 2
         echo "Starting Heat API..."
-        screen -S heat-api -p 0 -X stuff "heat-api --config-file $conf_file -d --log-file /tmp/heat-api.log
+        screen -S heat-api -p 0 -X stuff "heat-api --config-file $conf_file -d --log-file /tmp/heat-api.log 2>>/tmp/heat-api.log
 "
         sleep 5
         curl_req=`curl http://localhost:8004/v1/tenant/stacks`
@@ -89,7 +88,7 @@ case $package in
         screen -dmS heat-engine
         sleep 2
         echo "Starting Heat Engine..."
-        screen -S heat-engine -p 0 -X stuff "heat-engine --config-file $conf_file -d --log-file /tmp/heat-engine.log
+        screen -S heat-engine -p 0 -X stuff "heat-engine --config-file $conf_file -d --log-file /tmp/heat-engine.log 2>>/tmp/heat-engine.log
 "
         sleep 5
         cat /tmp/heat-engine.log
@@ -114,7 +113,7 @@ case $package in
         screen -dmS heat-api-cfn
         sleep 2
         echo "Starting Heat API CFN..."
-        screen -S heat-api-cfn -p 0 -X stuff "heat-api-cfn --config-file $conf_file -d --log-file /tmp/heat-api-cfn.log
+        screen -S heat-api-cfn -p 0 -X stuff "heat-api-cfn --config-file $conf_file -d --log-file /tmp/heat-api-cfn.log 2>>/tmp/heat-api-cfn.log
 "
         sleep 5
         cat /tmp/heat-api-cfn.log
@@ -132,7 +131,7 @@ case $package in
         screen -dmS heat-api-clw
         sleep 2
         echo "Starting Heat API Cloudwatch..."
-        screen -S heat-api-clw -p 0 -X stuff "heat-api-cloudwatch --config-file $conf_file -d --log-file /tmp/heat-api-clw.log
+        screen -S heat-api-clw -p 0 -X stuff "heat-api-cloudwatch --config-file $conf_file -d --log-file /tmp/heat-api-clw.log 2>>/tmp/heat-api-clw.log
 "
         sleep 5
         cat /tmp/heat-api-clw.log
-- 
2.45.2