From: dtrishkin Date: Mon, 25 Jan 2016 14:32:46 +0000 (-0500) Subject: Add heat 6.0.0 X-Git-Tag: mos-9.0~3 X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=7c136994dc77da0332b5c91413d4a9b8126a34bd;p=openstack-build%2Fheat-build.git Add heat 6.0.0 * Sources are from https://review.fuel-infra.org/gitweb?p=openstack-build/heat-build.git;a=tree;\ h=refs/heads/anonscm.debian.org/debian/mitaka/for-trusty;\ hb=refs/heads/anonscm.debian.org/debian/mitaka/for-trusty * Update runtime requirements according to global requirements of Mitaka * Update build depends according to test requirements of the project Change-Id: I3d9f765c447a7e98c02635d2b5c396987a3f86b3 --- diff --git a/tests/runtests.sh b/tests/runtests.sh index bb6a896f..1cbf211b 100755 --- a/tests/runtests.sh +++ b/tests/runtests.sh @@ -204,7 +204,7 @@ case $package in echo "Something went wrong! Log file have trace errors! Check logs" RES=1 else - rabbit_connections=`cat $log_file | grep 'Connected to AMQP server on' | wc -l` + rabbit_connections=`cat $log_file | grep -E '(Reco|Co)nnected to AMQP server on' | wc -l` if [ "$rabbit_connections" -eq "0" ] then echo "Heat Engine: Can't connected to RabbitMQ" diff --git a/trusty/debian/changelog b/trusty/debian/changelog index 0ae0e76e..34de6145 100644 --- a/trusty/debian/changelog +++ b/trusty/debian/changelog @@ -1,19 +1,51 @@ -heat (1:5.0.0-1~u14.04+mos2) mos8.0; urgency=medium +heat (1:6.0.0~b2-1~u14.04+mos1) mos9.0; urgency=medium - * trusty/debian/rules: - - add copying of dist-packages content - - Closes-Bug: #1516112 + * Sources are from + https://review.fuel-infra.org/gitweb?p=openstack-build/heat-build.git;a=tree;\ + h=refs/heads/anonscm.debian.org/debian/mitaka/for-trusty;\ + hb=refs/heads/anonscm.debian.org/debian/mitaka/for-trusty + * Update runtime requirements according to global requirements of Mitaka + * Update build depends according to test requirements of the project - -- Daniil Trishkin Fri, 13 Nov 2015 21:38:00 +0300 + -- Daniil Trishkin Fri, 22 Jan 2016 17:37:29 +0300 -heat (1:5.0.0.0b2-1~u14.04+mos1) mos8.0; urgency=medium +heat (1:6.0.0~b2-1) experimental; urgency=medium - * Rebuild for Liberty release - * Source: http://http.debian.net/debian/pool/main/h/heat/heat_5.0.0~rc1-1.dsc - * Update requirements according to global requirements of Liberty - * Comment out allow-route-2.0.patch + * New upstream release. + * Fixed (build-)depends for this release. + * Removed the patch for allowing routes 2.0. + * Also package new /usr/bin/heat-wsgi-api{,-cloudwatch,-cfn} + * Fixed debian/copyright ordering. + * Updated heat.conf generation --namespace params. + + -- Thomas Goirand Tue, 08 Dec 2015 14:16:00 +0100 + +heat (1:5.0.0-4) unstable; urgency=medium + + * debian/rules: + - add copying of dist-packages/heat/cloudinit/ content + + -- Daniil Trishkin Mon, 16 Nov 2015 16:53:39 +0300 + +heat (1:5.0.0-3) unstable; urgency=medium + + * Added q-text-as-data in depends: for heat-common. + + -- Thomas Goirand Tue, 03 Nov 2015 11:41:56 +0000 + +heat (1:5.0.0-2) unstable; urgency=medium + + * Rebuilt with openstack-pkg-tools 37 to use Keystone API v3. + + -- Thomas Goirand Tue, 03 Nov 2015 08:21:25 +0000 + +heat (1:5.0.0-1) unstable; urgency=medium + + * New upstream release. + * Uploading to unstable. + * Added python-pymysql as runtime dependency. - -- Daniil Trishkin Fri, 25 Sep 2015 0:09:29 +0300 + -- Thomas Goirand Tue, 13 Oct 2015 15:02:21 +0200 heat (1:5.0.0~rc1-1) experimental; urgency=medium diff --git a/trusty/debian/control b/trusty/debian/control index 9b9bb6fb..3468ec90 100644 --- a/trusty/debian/control +++ b/trusty/debian/control @@ -6,76 +6,84 @@ Uploaders: Thomas Goirand , Build-Depends: debhelper (>= 9), dh-python, dh-systemd, - openstack-pkg-tools (>= 23~), + openstack-pkg-tools (>= 37~), po-debconf, python-all, python-pbr (>= 1.8), python-setuptools, - python-sphinx, + python-sphinx (>= 1.1.2), Build-Depends-Indep: bandit (>= 0.13.2), + git, python-babel, python-barbicanclient (>= 3.3.0), - python-ceilometerclient (>= 1.0.13), + python-ceilometerclient (>= 2.2.1), python-cinderclient (>= 1:1.3.1), python-croniter, - python-coverage, + python-coverage (>= 3.6), python-crypto, python-cryptography (>= 1.0), - python-designateclient (>= 1.0.0), + python-debtcollector (>= 1.2.0), + python-designateclient (>= 1.5.0), python-eventlet (>= 0.17.4), - python-glanceclient (>= 1:0.18.0), + python-glanceclient (>= 1:1.2.0), python-greenlet, - python-hacking, - python-heatclient (>= 0.3.0), + python-hacking (>= 0.10.0), + python-heatclient (>= 0.6.0), python-keystoneclient (>= 1:1.6.0), - python-keystonemiddleware (>= 2.0.0), - python-kombu, + python-keystonemiddleware (>= 4.0.0), + python-kombu (>= 3.0.7), python-lxml, python-magnumclient, python-manilaclient (>= 1.3.0), python-migrate (>= 0.9.6), python-mistralclient (>= 1.0.0), - python-mock, - python-mox, + python-mock (>= 1.2), + python-mox3 (>= 0.7.0), python-mysqldb, python-netaddr (>= 0.7.12), python-neutronclient (>= 1:2.6.0), - python-novaclient (>= 2:2.22.0), - python-oslo.cache (>= 0.4.0), + python-novaclient (>= 2:2.29.0), + python-openstackclient (>= 2.0.0), + python-oslo.cache (>= 1.0.0), python-oslo.concurrency (>= 2.3.0), - python-oslo.config (>= 1:2.3.0), + python-oslo.config (>= 1:3.2.0), python-oslo.context (>= 0.2.0), - python-oslo.db (>= 2.4.1), + python-oslo.db (>= 4.1.0), python-oslo.i18n (>= 1.5.0), - python-oslo.log (>= 1.8.0), - python-oslo.messaging (>= 1.16.0), - python-oslo.middleware (>= 2.8.0), + python-oslo.log (>= 2.0.0), + python-oslo.messaging (>= 3.0.0), + python-oslo.middleware (>= 3.0.0), python-oslo.policy (>= 0.5.0), - python-oslo.reports, - python-oslo.serialization (>= 1.4.0), - python-oslo.service (>= 0.8.0), - python-oslo.utils (>= 2.0.0), - python-oslo.versionedobjects (>= 0.9.0), + python-oslo.reports (>= 1.0.0), + python-oslo.serialization (>= 2.0.0), + python-oslo.service (>= 1.0.0), + python-oslo.utils (>= 3.4.0), + python-oslo.versionedobjects (>= 1.0.0), python-oslosphinx (>= 2.5.0), python-oslotest (>= 1.10.0), - python-osprofiler, - python-paramiko, + python-osprofiler (>= 0.4.0), + python-paramiko (>= 1.13.0), python-pastedeploy, - python-psycopg2, - python-requests (>= 2.5.2), + python-psycopg2 (>= 2.5), + python-pymysql (>= 0.6.2), + python-qpid, + python-reno (>= 0.1.1), + python-requests (>= 2.8.1), python-routes, python-saharaclient (>= 0.10.0), + python-senlinclient, python-six (>= 1.9.0), - python-sqlalchemy (>= 0.9.9), + python-sqlalchemy (>= 1.0.10), python-stevedore (>= 1.5.0), python-swiftclient, - python-testscenarios, + python-testscenarios (>= 0.4), + python-testresources (>= 0.2.4), python-testtools (>= 1.4.0), python-troveclient (>= 1:1.2.0), python-tz, python-webob, python-yaml, - python-zaqarclient (>= 0.1.1), + python-zaqarclient (>= 0.3.0), subunit, testrepository, Standards-Version: 3.9.6 @@ -88,59 +96,63 @@ Section: python Architecture: all Depends: python-babel (>= 1.3), python-barbicanclient (>= 3.3.0), - python-ceilometerclient (>= 1.0.13), + python-ceilometerclient (>= 2.2.1), python-cinderclient (>= 1:1.3.1), python-croniter (>= 0.3.4), - python-crypto (>= 2.6), + python-crypto, python-cryptography (>= 1.0), - python-designateclient (>= 1.0.0), + python-debtcollector (>= 1.2.0), + python-designateclient (>= 1.5.0), python-eventlet (>= 0.17.4), - python-glanceclient (>= 1:0.18.0), + python-glanceclient (>= 1:1.2.0), python-greenlet (>= 0.3.2), - python-heatclient (>= 0.3.0), + python-heatclient (>= 0.6.0), python-keystoneclient (>= 1:1.6.0), - python-keystonemiddleware (>= 2.0.0), - python-kombu (>= 3.0.7), + python-keystonemiddleware (>= 4.0.0), python-lxml (>= 2.3), python-magnumclient (>= 0.2.1), python-manilaclient (>= 1.3.0), - python-memcache (>= 1.2.9), + python-memcache (>= 1.56), python-migrate (>= 0.9.6), python-mistralclient (>= 1.0.0), python-mysqldb, python-netaddr (>= 0.7.12), python-neutronclient (>= 1:2.6.0), - python-novaclient (>= 2:2.22.0), - python-oslo.cache (>= 0.4.0), + python-novaclient (>= 2:2.29.0), + python-openstackclient (>= 2.0.0), + python-oslo.cache (>= 1.0.0), python-oslo.concurrency (>= 2.3.0), - python-oslo.config (>= 1:2.3.0), + python-oslo.config (>= 1:3.2.0), python-oslo.context (>= 0.2.0), - python-oslo.db (>= 2.4.1), - python-oslo.i18n (>= 1.5.0), - python-oslo.log (>= 1.8.0), - python-oslo.messaging (>= 1.16.0), - python-oslo.middleware (>= 2.8.0), + python-oslo.db (>= 4.1.0), + python-oslo.i18n (>= 2.1.0), + python-oslo.log (>= 2.0.0), + python-oslo.messaging (>= 4.0.0), + python-oslo.middleware (>= 3.0.0), python-oslo.policy (>= 0.5.0), - python-oslo.reports (>= 0.1.0), - python-oslo.serialization (>= 1.4.0), - python-oslo.service (>= 0.8.0), - python-oslo.utils (>= 2.0.0), - python-oslo.versionedobjects (>= 0.9.0), - python-osprofiler (>= 0.3.0), + python-oslo.reports (>= 1.0.0), + python-oslo.serialization (>= 2.0.0), + python-oslo.service (>= 1.0.0), + python-oslo.utils (>= 3.4.0), + python-oslo.versionedobjects (>= 1.4.0), + python-osprofiler (>= 0.4.0), python-pastedeploy (>= 1.5.0), python-pbr (>= 1.8), - python-requests (>= 2.5.2), + python-psycopg2 (>= 2.5), + python-pymysql (>= 0.6.2), + python-requests (>= 2.8.1), python-routes (>= 1.12.3), python-saharaclient (>= 0.10.0), + python-senlinclient, python-six (>= 1.9.0), - python-sqlalchemy (>= 0.9.9), + python-sqlalchemy (>= 1.0.10), python-stevedore (>= 1.5.0), python-swiftclient (>= 2.2.0), python-troveclient (>= 1:1.2.0), python-tz (>= 2013.6), python-webob (>= 1.2.3), - python-yaml (>= 3.1.0), - python-zaqarclient (>= 0.1.1), + python-yaml, + python-zaqarclient (>= 0.3.0), ${misc:Depends}, ${python:Depends}, Description: OpenStack orchestration service - Python files @@ -154,7 +166,8 @@ Package: heat-common Architecture: all Depends: adduser, dbconfig-common, - python-heat (=${binary:Version}), + python-heat (= ${binary:Version}), + q-text-as-data, ${misc:Depends}, ${python:Depends}, Description: OpenStack orchestration service - common files @@ -167,7 +180,7 @@ Description: OpenStack orchestration service - common files Package: heat-engine Architecture: all Depends: adduser, - heat-common (=${binary:Version}), + heat-common (= ${binary:Version}), ${misc:Depends}, ${ostack-lsb-base}, ${python:Depends}, @@ -182,8 +195,7 @@ Description: OpenStack orchestration service - engine Package: heat-api Architecture: all Depends: adduser, - heat-common (=${binary:Version}), - python-openstackclient (>= 1.5.0), + heat-common (= ${binary:Version}), ${misc:Depends}, ${ostack-lsb-base}, ${python:Depends}, @@ -197,7 +209,7 @@ Description: OpenStack orchestration service - ReST API Package: heat-api-cfn Architecture: all Depends: adduser, - heat-common (=${binary:Version}), + heat-common (= ${binary:Version}), ${misc:Depends}, ${ostack-lsb-base}, ${python:Depends}, @@ -211,7 +223,7 @@ Description: OpenStack orchestration service - CFN API Package: heat-api-cloudwatch Architecture: all Depends: adduser, - heat-common (=${binary:Version}), + heat-common (= ${binary:Version}), ${misc:Depends}, ${ostack-lsb-base}, ${python:Depends}, @@ -233,19 +245,3 @@ Description: OpenStack orchestration service - Documentation CloudFormation-compatible Query API. . This package contains the documentation. - - -Package: heat-docker -Architecture: all -Depends: - python-docker (>= 1.1.0), - heat-engine (=${binary:Version}), - ${misc:Depends}, - ${ostack-lsb-base}, - ${python:Depends} -Description: OpenStack orchestration service docker resource - Heat is a service to orchestrate multiple composite cloud applications using - templates, through both an OpenStack-native ReST API and a - CloudFormation-compatible Query API. - . - This package contains the heat engine docker resource. diff --git a/trusty/debian/copyright b/trusty/debian/copyright index 6e0954ae..cc03f35a 100644 --- a/trusty/debian/copyright +++ b/trusty/debian/copyright @@ -1,12 +1,8 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: heat -Upstream-Contact: +Upstream-Contact: OpenStack Devel Source: https://github.com/openstack/heat -Files: debian/* -Copyright: 2012 Thomas Goirand -License: Apache-2 - Files: * Copyright: Angus Salkeld Zane Bitter @@ -30,6 +26,10 @@ Copyright: Angus Salkeld Jeremy Stanley License: Apache-2 +Files: debian/* +Copyright: (c) 2012-2016, Thomas Goirand +License: Apache-2 + License: Apache-2 Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/trusty/debian/gbp.conf b/trusty/debian/gbp.conf index e804d476..6fb07d66 100644 --- a/trusty/debian/gbp.conf +++ b/trusty/debian/gbp.conf @@ -1,6 +1,6 @@ [DEFAULT] upstream-branch = master -debian-branch = debian/liberty +debian-branch = debian/mitaka upstream-tag = %(version)s compression = xz diff --git a/trusty/debian/heat-api-cfn.service b/trusty/debian/heat-api-cfn.service new file mode 100644 index 00000000..b62dd249 --- /dev/null +++ b/trusty/debian/heat-api-cfn.service @@ -0,0 +1,16 @@ +[Unit] +Description=OpenStack Heat API CFN +Documentation=http://docs.openstack.org/ +After=postgresql.service mysql.service keystone.service rabbitmq-server.service ntp.service network.service + +[Service] +User=heat +Group=heat +ExecStart=/etc/init.d/heat-api-cfn systemd-start +ExecStop=/etc/init.d/heat-api-cfn systemd-stop +PIDFile=/var/run/heat/heat-api-cfn.pid +Restart=on-failure +Type=forking + +[Install] +WantedBy=multi-user.target diff --git a/trusty/debian/heat-api-cloudwatch.service b/trusty/debian/heat-api-cloudwatch.service new file mode 100644 index 00000000..33862350 --- /dev/null +++ b/trusty/debian/heat-api-cloudwatch.service @@ -0,0 +1,16 @@ +[Unit] +Description=OpenStack API CloudWatch +Documentation=http://docs.openstack.org/ +After=postgresql.service mysql.service keystone.service rabbitmq-server.service ntp.service network.service + +[Service] +User=heat +Group=heat +ExecStart=/etc/init.d/heat-api-cloudwatch systemd-start +ExecStop=/etc/init.d/heat-api-cloudwatch systemd-stop +PIDFile=/var/run/heat/heat-api-cloudwatch.pid +Restart=on-failure +Type=forking + +[Install] +WantedBy=multi-user.target diff --git a/trusty/debian/heat-api.service b/trusty/debian/heat-api.service new file mode 100644 index 00000000..9c14adc1 --- /dev/null +++ b/trusty/debian/heat-api.service @@ -0,0 +1,16 @@ +[Unit] +Description=OpenStack Heat API +Documentation=http://docs.openstack.org/ +After=postgresql.service mysql.service keystone.service rabbitmq-server.service ntp.service network.service + +[Service] +User=heat +Group=heat +ExecStart=/etc/init.d/heat-api systemd-start +ExecStop=/etc/init.d/heat-api systemd-stop +PIDFile=/var/run/heat/heat-api.pid +Restart=on-failure +Type=forking + +[Install] +WantedBy=multi-user.target diff --git a/trusty/debian/heat-common.install b/trusty/debian/heat-common.install index 6e7560b6..11f4f1d4 100644 --- a/trusty/debian/heat-common.install +++ b/trusty/debian/heat-common.install @@ -6,3 +6,6 @@ etc/heat/api-paste.ini etc/heat/environment.d/default.yaml etc/heat/policy.json etc/heat/templates +/usr/bin/heat-wsgi-api +/usr/bin/heat-wsgi-api-cloudwatch +/usr/bin/heat-wsgi-api-cfn diff --git a/trusty/debian/heat-docker.dirs b/trusty/debian/heat-docker.dirs deleted file mode 100644 index aee75347..00000000 --- a/trusty/debian/heat-docker.dirs +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/heat/docker diff --git a/trusty/debian/heat-docker.install b/trusty/debian/heat-docker.install deleted file mode 100644 index 16f88330..00000000 --- a/trusty/debian/heat-docker.install +++ /dev/null @@ -1 +0,0 @@ -contrib/heat_docker/heat_docker/* /usr/lib/heat/docker diff --git a/trusty/debian/heat-engine.service b/trusty/debian/heat-engine.service new file mode 100644 index 00000000..8af82acc --- /dev/null +++ b/trusty/debian/heat-engine.service @@ -0,0 +1,16 @@ +[Unit] +Description=OpenStack Heat Engine +Documentation=http://docs.openstack.org/ +After=postgresql.service mysql.service keystone.service rabbitmq-server.service ntp.service network.service + +[Service] +User=heat +Group=heat +ExecStart=/etc/init.d/heat-engine systemd-start +ExecStop=/etc/init.d/heat-engine systemd-stop +PIDFile=/var/run/heat/heat-engine.pid +Restart=on-failure +Type=forking + +[Install] +WantedBy=multi-user.target diff --git a/trusty/debian/patches/allow-route-2.0.patch b/trusty/debian/patches/allow-route-2.0.patch deleted file mode 100644 index 8936094b..00000000 --- a/trusty/debian/patches/allow-route-2.0.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 0a76cdd97e3a5a447156039435c3aa741a006d76 Mon Sep 17 00:00:00 2001 -From: dtrishkin -Date: Tue, 6 Oct 2015 16:47:29 +0300 -Subject: [PATCH] The Debian package for Routes 2.0 is perfectly valid, as it - contains patches. This patch makes it possible to use it. - ---- - requirements.txt | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/requirements.txt b/requirements.txt -index 5df80f6..e4d6022 100644 ---- a/requirements.txt -+++ b/requirements.txt -@@ -49,8 +49,7 @@ python-zaqarclient>=0.1.1 - pytz>=2013.6 - PyYAML>=3.1.0 - requests>=2.5.2 --Routes!=2.0,!=2.1,>=1.12.3;python_version=='2.7' --Routes!=2.0,>=1.12.3;python_version!='2.7' -+Routes>=1.12.3 - six>=1.9.0 - SQLAlchemy<1.1.0,>=0.9.9 - sqlalchemy-migrate>=0.9.6 --- -1.9.1 - diff --git a/trusty/debian/patches/series b/trusty/debian/patches/series index b0a62fcd..5f60075e 100644 --- a/trusty/debian/patches/series +++ b/trusty/debian/patches/series @@ -1,2 +1 @@ only-run-tests-in-heat.tests.patch -#allow-route-2.0.patch diff --git a/trusty/debian/rules b/trusty/debian/rules index a9ed71c0..5f449d07 100755 --- a/trusty/debian/rules +++ b/trusty/debian/rules @@ -36,22 +36,25 @@ override_dh_install: mkdir -p $(CURDIR)/debian/heat-common/usr/share/heat-common oslo-config-generator \ --namespace heat.common.config \ + --namespace heat.common.context \ --namespace heat.common.crypt \ --namespace heat.common.heat_keystoneclient \ --namespace heat.common.wsgi \ --namespace heat.engine.clients \ --namespace heat.engine.notification \ --namespace heat.engine.resources \ - --namespace heat.openstack.common.eventlet_backdoor \ - --namespace heat.openstack.common.log \ - --namespace heat.openstack.common.policy \ - --namespace heat.api.middleware.ssl \ + --namespace heat.api.middleware.ssl \ --namespace heat.api.aws.ec2token \ --namespace keystonemiddleware.auth_token \ --namespace oslo.messaging \ + --namespace oslo.middleware \ --namespace oslo.db \ --namespace oslo.log \ - --wrap-width 120 \ + --namespace oslo.policy \ + --namespace oslo.service.service \ + --namespace oslo.service.periodic_task \ + --namespace oslo.service.sslutil \ + --wrap-width 140 \ --output-file $(CURDIR)/debian/heat-common/usr/share/heat-common/heat.conf sed -i 's|^[# \t]*connection[\t #]*=.*|connection=sqlite:////var/lib/heat/heatdb|' $(CURDIR)/debian/heat-common/usr/share/heat-common/heat.conf sed -i 's|^[# \t]*auth_protocol[\t #]*=.*|auth_protocol = http|' $(CURDIR)/debian/heat-common/usr/share/heat-common/heat.conf