From: Mikhail Ivanov Date: Mon, 2 Mar 2015 15:35:12 +0000 (+0300) Subject: Update requirements for heat from global X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=refs%2Fheads%2Fopenstack-ci%2Ffuel-6.0.1%2F2014.2;p=openstack-build%2Fheat-build.git Update requirements for heat from global Change-Id: Iffb23b089b07c3bad741cc5ac2420ed92e770fd8 --- diff --git a/debian/changelog b/debian/changelog index 3375dc53..62fb23e6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +heat (2014.2.2-0ubuntu1) trusty; urgency=medium + + * update for global requirements + + -- Mikhail Ivanov Mon, 02 Mar 2015 18:34:19 +0400 + heat (2014.2.b3-0ubuntu1) trusty; urgency=medium * update for global requirements diff --git a/debian/control b/debian/control index ffd5b905..03fe741d 100644 --- a/debian/control +++ b/debian/control @@ -80,19 +80,20 @@ Depends: python-httplib2 (>= 0.7.5), python-iso8601 (>= 0.1.9), python-keystonemiddleware (>= 1.0.0), - python-kombu (>= 2.4.8), + python-kombu (>= 3.0.7), python-lxml (>= 2.3), python-netaddr (>= 0.7.12), python-oslo.config (>= 1.4.0), python-oslo.i18n (>= 1.0.0), python-oslo.messaging (>= 1.4.0), python-oslo.db (>= 1.0.0), + python-oslo.utils (>= 1.0.0), python-pastedeploy (>= 1.5.0), python-pbr (>= 0.6), python-pbr (<< 0.7) | python-pbr (>> 0.7), python-posix-ipc, python-crypto (>= 2.6), python-ceilometerclient (>= 1.0.6), - python-cinderclient (>= 1.0.7), + python-cinderclient (>= 1.1.0), python-glanceclient (>= 0.14.0), python-heatclient (>= 0.2.9), python-keystoneclient (>= 0.10.0), @@ -103,11 +104,11 @@ Depends: python-troveclient (>= 1.0.4), python-yaml (>= 3.1.0), python-qpid, - python-requests (>= 1.2.1), python-requests ( << 2.4.0) | python-requests (>> 2.4.0), + python-requests (>= 2.1.0), python-requests (<< 2.2.2), python-routes (>= 1.12.3), python-routes ( << 2.0) | python-routes (>> 2.0), python-six (>= 1.7.0), python-sqlalchemy (>= 0.8.4), python-sqlalchemy (<< 0.8.99) | python-sqlalchemy (>= 0.9.7), python-sqlalchemy ( << 0.9.99), - python-migrate (>= 0.9.1), python-migrate ( << 0.9.2) | python-migrate (>> 0.9.2), + python-migrate (>= 0.9.1), python-migrate (<< 0.9.2), python-stevedore (>= 1.0.0), python-webob (>= 1.2.3), python-boto (>= 2.4), diff --git a/rpm/SPECS/openstack-heat.spec b/rpm/SPECS/openstack-heat.spec index 2ef434d4..03bc7b0a 100644 --- a/rpm/SPECS/openstack-heat.spec +++ b/rpm/SPECS/openstack-heat.spec @@ -7,7 +7,7 @@ Name: openstack-heat Summary: OpenStack Orchestration (heat) -Version: 2014.2.b3 +Version: 2014.2.2 Release: 2.1%{?dist} License: ASL 2.0 Group: System Environment/Base @@ -174,19 +174,20 @@ Requires: python-greenlet >= 0.3.2 Requires: python-httplib2 >= 0.7.5 Requires: python-iso8601 >= 0.1.9 Requires: python-keystonemiddleware >= 1.0.0 -Requires: python-kombu >= 2.4.8 +Requires: python-kombu >= 3.0.7 Requires: python-lxml >= 2.3 Requires: python-netaddr >= 0.7.12 Requires: python-oslo-config >= 1.4.0 Requires: python-oslo-messaging >= 1.4.0 Requires: python-oslo-db >= 1.0.0 Requires: python-oslo-i18n >= 1.0.0 +Requires: python-oslo-utils >= 1.0.0 Requires: python-paste-deploy >= 1.5.0 Requires: python-pbr >= 0.6, python-pbr < 0.7, python-pbr > 0.7, python-pbr < 1.0 Requires: python-posix_ipc Requires: python-crypto >= 2.6 Requires: python-ceilometerclient >= 1.0.6 -Requires: python-cinderclient >= 1.0.7 +Requires: python-cinderclient >= 1.1.0 Requires: python-glanceclient >= 0.14.0 Requires: python-heatclient >= 0.2.9 Requires: python-keystoneclient >= 0.10.0 @@ -197,11 +198,11 @@ Requires: python-swiftclient >= 2.2.0 Requires: python-troveclient >= 1.0.4 Requires: PyYAML >= 3.1.0 Requires: python-qpid -Requires: python-requests >= 1.2.1, python-requests < 2.4.0, python-requests > 2.4.0 +Requires: python-requests >= 2.1.0, python-requests < 2.2.2 Requires: python-routes >= 1.12.3, python-routes < 2.0, python-routes > 2.0 Requires: python-six >= 1.7.0 Requires: python-sqlalchemy >= 0.8.4, python-sqlalchemy <= 0.8.99, python-sqlalchemy >= 0.9.7, python-sqlalchemy <= 0.9.99 -Requires: python-migrate >= 0.9.1, python-migrate < 0.9.2, python-migrate > 0.9.2 +Requires: python-migrate = 0.9.1 Requires: python-stevedore >= 1.0.0 Requires: python-webob >= 1.2.3 @@ -405,6 +406,9 @@ fi %changelog +* Mon Mar 02 2015 Mikhail Ivanov - 2014.2.2 +- update for global requirements + * Wed Sep 17 2014 Denis Egorenko - 2014.2.b2 - update for global requirements - fix init script (explicitly setting config file) diff --git a/tests/runtests.sh b/tests/runtests.sh index e3428037..5489f413 100755 --- a/tests/runtests.sh +++ b/tests/runtests.sh @@ -9,13 +9,13 @@ 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-client MySQL-python 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 + echo "127.0.10.1 $(hostname)" >> /etc/hosts service rabbitmq-server start mysql -uroot -p$MYSQL_PASSWORD -Bse "create database heat" sed -i "/^\[database\]/a connection=mysql://root:$MYSQL_PASSWORD@localhost/heat" $conf_file