From 8c03ac51ff2365a9cd1bd00f24e6b058a028e8d0 Mon Sep 17 00:00:00 2001 From: Mikhail Ivanov Date: Mon, 2 Mar 2015 18:47:57 +0300 Subject: [PATCH] Update requirements for heat from globals * Requirements have been updated according to https://github.com/openstack/heat/blob/2014.2.2/requirements.txt and global requirements, because they are obsolete * fix patch for requirements Change-Id: I4bf2494c11ea75608cb59166fd88b6123fcf9e66 --- debian/changelog | 293 ------------------ debian/compat | 1 - debian/control | 216 ------------- debian/copyright | 47 --- debian/gbp.conf | 9 - debian/heat-api-cfn.init | 87 ------ debian/heat-api-cfn.install | 1 - debian/heat-api-cfn.logrotate | 4 - debian/heat-api-cfn.postrm | 14 - debian/heat-api-cfn.upstart | 8 - debian/heat-api-cloudwatch.init | 87 ------ debian/heat-api-cloudwatch.install | 1 - debian/heat-api-cloudwatch.logrotate | 4 - debian/heat-api-cloudwatch.postrm | 14 - debian/heat-api-cloudwatch.upstart | 8 - debian/heat-api.init | 86 ----- debian/heat-api.install | 1 - debian/heat-api.logrotate | 4 - debian/heat-api.postrm | 14 - debian/heat-api.upstart | 8 - debian/heat-common.dirs | 5 - debian/heat-common.install | 7 - debian/heat-common.postinst | 22 -- debian/heat-common.postrm | 15 - debian/heat-docker.dirs | 1 - debian/heat-docker.install | 1 - debian/heat-engine.init | 87 ------ debian/heat-engine.install | 1 - debian/heat-engine.logrotate | 4 - debian/heat-engine.postinst | 12 - debian/heat-engine.postrm | 14 - debian/heat-engine.upstart | 8 - debian/patches/default-sqlite.patch | 19 -- debian/patches/series | 0 debian/patches/skip-tests.patch | 43 --- debian/patches/sudoers_patch.patch | 17 - debian/pydist-overrides | 3 - debian/python-heat.install | 1 - debian/rules | 24 -- debian/source/format | 1 - debian/tests/control | 3 - debian/tests/heat-daemons | 15 - debian/tests/python-heat | 14 - debian/tests/test_import_heat.py | 4 - debian/watch | 3 - rpm/SPECS/openstack-heat.spec | 26 +- tests/runtests.sh | 3 +- trusty/debian/changelog | 6 + trusty/debian/control | 23 +- .../patches/requirements-built-in.patch | 36 ++- 50 files changed, 58 insertions(+), 1267 deletions(-) delete mode 100644 debian/changelog delete mode 100644 debian/compat delete mode 100644 debian/control delete mode 100644 debian/copyright delete mode 100644 debian/gbp.conf delete mode 100644 debian/heat-api-cfn.init delete mode 100644 debian/heat-api-cfn.install delete mode 100644 debian/heat-api-cfn.logrotate delete mode 100644 debian/heat-api-cfn.postrm delete mode 100644 debian/heat-api-cfn.upstart delete mode 100644 debian/heat-api-cloudwatch.init delete mode 100644 debian/heat-api-cloudwatch.install delete mode 100644 debian/heat-api-cloudwatch.logrotate delete mode 100644 debian/heat-api-cloudwatch.postrm delete mode 100644 debian/heat-api-cloudwatch.upstart delete mode 100644 debian/heat-api.init delete mode 100644 debian/heat-api.install delete mode 100644 debian/heat-api.logrotate delete mode 100644 debian/heat-api.postrm delete mode 100644 debian/heat-api.upstart delete mode 100644 debian/heat-common.dirs delete mode 100644 debian/heat-common.install delete mode 100644 debian/heat-common.postinst delete mode 100644 debian/heat-common.postrm delete mode 100644 debian/heat-docker.dirs delete mode 100644 debian/heat-docker.install delete mode 100644 debian/heat-engine.init delete mode 100644 debian/heat-engine.install delete mode 100644 debian/heat-engine.logrotate delete mode 100644 debian/heat-engine.postinst delete mode 100644 debian/heat-engine.postrm delete mode 100644 debian/heat-engine.upstart delete mode 100644 debian/patches/default-sqlite.patch delete mode 100644 debian/patches/series delete mode 100644 debian/patches/skip-tests.patch delete mode 100644 debian/patches/sudoers_patch.patch delete mode 100644 debian/pydist-overrides delete mode 100644 debian/python-heat.install delete mode 100755 debian/rules delete mode 100644 debian/source/format delete mode 100644 debian/tests/control delete mode 100755 debian/tests/heat-daemons delete mode 100755 debian/tests/python-heat delete mode 100644 debian/tests/test_import_heat.py delete mode 100644 debian/watch diff --git a/debian/changelog b/debian/changelog deleted file mode 100644 index 37b76b39..00000000 --- a/debian/changelog +++ /dev/null @@ -1,293 +0,0 @@ -heat (2014.2.b3-0ubuntu1) trusty; urgency=medium - - * update docker resource python script location according to LP 1404911 - - -- Igor Yozhikov Wed, 31 Dec 2014 12:30:05 +0400 - -heat (2014.2.b3-0ubuntu1) trusty; urgency=medium - - * update for global requirements - * fix init script (explicitly setting config file) - - -- Denis Egorenko Wed, 17 Sep 2014 19:46:19 +0400 - -heat (2014.2~b1-0ubuntu1) trusty; urgency=medium - - * updated for LP BP build from master - - -- Igor Yozhikov Fri, 4 Jul 2014 12:39:05 +0400 - -heat (2014.1.1-0ubuntu1) trusty; urgency=medium - - * Resynchronize with stable/icehouse (27557c9) (LP: #1328134): - - [368b6d3] Avoid redundant polling of DB for metadata - - [0f92683] Fix failed to delete the NovaFloatingIPAssociation resource - - [930cb3c] Fix status reason in events for deployment signals - - [4b9ff4f] Truncate status_reason to column length - - [3c560c6] Catch NotFound for keystone delete operations - - [e63baf6] Using correct attribute of exception - - [08154b0] Allow NotFound to be created without args - - [857ca78] Updated from global requirements - - [03dd894] Don't dynamically create provider types in the global env - - [937ac5a] Ignore nova limits set to '-1' - - [27557c9] Don't pass enable_snat by default in Router - * d/p/fix-requirements.patch: Drop minimum version of six to align to Ubuntu - 14.04 version. - - -- Corey Bryant Mon, 09 Jun 2014 15:09:49 -0400 - -heat (2014.1-0ubuntu1) trusty; urgency=medium - - [ Chuck Short ] - * New upstream release. (LP: #1299055) - * debian/heat-common.postinst: Create directory before changing - permissions. (LP: #1267557) - - [ Corey Bryant ] - * New upstream release (LP: #1299055). - - -- Chuck Short Thu, 17 Apr 2014 07:27:41 -0400 - -heat (2014.1~rc2-0ubuntu3) trusty; urgency=medium - - * debian/heat-common.postinst: Fix failing autopkg test. - - -- Chuck Short Mon, 14 Apr 2014 13:36:05 -0400 - -heat (2014.1~rc2-0ubuntu2) trusty; urgency=medium - - * Fix up packaging based on Ubuntu Security Team review (LP: #1267557): - - debian/control: Drop python-sendfile since it is no longer - needed. - - debian/heat-common.install: Correct permissions of /etc/heat. - - debian/patches/sudoers_patch.patch: Change the directory location - for the sudoers so that it users the standard /etc/sudoers.d - directory. - - -- Chuck Short Fri, 11 Apr 2014 15:25:44 -0400 - -heat (2014.1~rc2-0ubuntu1) trusty; urgency=medium - - * New upstream release candidate (LP: #1299055). - * debian/patches/fix-requirements.patch: Don't install - python-qpid since we use python-kombu by default (LP: #1296912). - - -- Chuck Short Thu, 10 Apr 2014 08:51:46 -0400 - -heat (2014.1~rc1-0ubuntu1) trusty; urgency=medium - - * New upstream release (LP: #1299055) - * debian/patches/use-oslo.sphinx-namespace.patch: Dropped no longer - needed. - * debian/control: Rename python-oslo.sphinx to python-oslosphinx. - - -- Chuck Short Mon, 31 Mar 2014 21:36:06 -0400 - -heat (2014.1~b3-0ubuntu1) trusty; urgency=medium - - [ Chuck Short ] - * New upstream release. - * debian/patches/adjust-dependencies.patch: Dropped no longer needed. - * debian/control: Add python-troveclient. - * debian/rules: fail to build if testsuite fails. - * debian/patches/use-oslo.sphinx-namespace.patch: Use oslo.sphinx namespace. - - [ Adam Gandelman ] - * debian/heat-engine.install: Install /etc/heat/environment.d/*. - (LP: #1285875). - - -- Chuck Short Thu, 06 Mar 2014 17:18:51 -0500 - -heat (2014.1~b2-0ubuntu1) trusty; urgency=low - - [ James Page ] - * d/p/*: Refreshed. - - [ Yolanda Robla ] - * debian/control: Added lockfile to build depends - - [ Chuck Short ] - * debian/patches/adjust-dependencies: Adjust Ubuntu dependencies. - * debian/patches/skip-tests.patch: Skip failing tests on buildds. - * debian/rules: Add pythonpath for tests. - - -- Chuck Short Thu, 23 Jan 2014 15:28:54 -0500 - -heat (2014.1~b1-0ubuntu2) trusty; urgency=low - - * debian/patches/default-sqlite.patch: Update default sqlite path to - fix heat-engine install failures. - - -- James Page Fri, 06 Dec 2013 11:26:25 +0000 - -heat (2014.1~b1-0ubuntu1) trusty; urgency=low - - [ Chuck Short ] - * New upstream release. - * debian/control: - + Open icehouse release. - + Dropped python-argparse, python-qpid, python-noseexcover, - python-nose, and python-pycryptopp - + Add versioned depends for python-pbr. - + Add python-testscenarios as a build dependency. - * debian/patches/default-sqlite.patch: Dropped no longer needed. - - [ Yolanda Robla ] - * debian/control: Added python-heatclient as a build dependency. - - -- Chuck Short Thu, 05 Dec 2013 21:17:37 -0500 - -heat (2013.2-0ubuntu1) saucy; urgency=low - - * New upstream release (LP: #1236462). - - -- Chuck Short Thu, 17 Oct 2013 09:30:24 -0400 - -heat (2013.2~rc2-0ubuntu1) saucy; urgency=low - - * New upstream release candidate (LP: #1239156). - - -- James Page Sat, 12 Oct 2013 16:53:03 +0100 - -heat (2013.2~rc1-0ubuntu1) saucy; urgency=low - - * New upstream release. - * debian/control: Dropped python-d2to1 build dependency. - - -- Chuck Short Thu, 03 Oct 2013 09:43:04 -0400 - -heat (2013.2~b3-0ubuntu1) saucy; urgency=low - - [ Chuck Short ] - * New upstream release. - * debian/control: Add python-netaddr as build-dep. - * debian/heat-common.install: Remove heat-boto and associated man-page - * debian/heat-common.install: Remove heat-cfn and associated man-page - * debian/heat-common.install: Remove heat-watch and associated man-page - * debian/patches/fix-sqlalchemy-0.8.patch: Dropped - - [ Adam Gandelman ] - * debian/patches/default-kombu.patch: Dropped. - * debian/patches/default-sqlite.patch: Refreshed. - * debian/*.install, rules: Install heat.conf.sample as common - config file in heat-common. Drop other per-package configs, they - are no longer used. - * debian/rules: Clean pbr .egg from build dir if it exists. - - -- Chuck Short Mon, 09 Sep 2013 13:10:26 -0400 - -heat (2013.2~b2.a186.g2b4b248-0ubuntu2) saucy; urgency=low - - * d/rules: Limit test execution concurrency to 1 to avoid test failures - in buildds. - - -- James Page Thu, 08 Aug 2013 15:42:32 +0100 - -heat (2013.2~b2.a186.g2b4b248-0ubuntu1) saucy; urgency=low - - [ Chuck Short ] - * debian/patches/rename-quantumclient.patch: Dropped no longer needed. - * debian/control: Add python-oslo.sphinx - - [ James Page ] - * New upstream snapshot. - * d/watch: Updated to track releases on launchpad. - * d/control: Drop BD in pep8, no longer required. - * d/control,rules: Drop use of openstack-pkg-tools, revert use of xz - compression for debs. - * d/control,*.config,*.templates,po: Drop use of debconf/dbconfig-common - to configure heat. - * d/*.upstart: Add upstart configurations for Ubuntu. - * d/p/default-kombu.patch: Switch default messaging from qpid to - kombu. - * d/p/default-sqlite.patch: Use sqlite as default database option. - * d/control: Add python-ceilometerclient to BD's. - * d/rules: Fail package build for unit test failures. - * d/*.install: Directly install configuration files to /etc/heat. - * d/control: Update VCS locations to ubuntu-server-dev branches. - * d/heat-common.{install,manpages}: Include new binaries and associated - manpages. - - -- James Page Thu, 08 Aug 2013 15:23:59 +0100 - -heat (2013.2~b2-0ubuntu4) saucy; urgency=low - - [ Chuck Short ] - * debian/rules: Enable testsuite during builds. - * debian/patches/fix-sqlalchemy-0.8.patch: Build against sqlalchemy 0.8. - * debian/patches/rename-quantumclient.patch: quantumclient -> neutronclient. - - -- Chuck Short Thu, 08 Aug 2013 01:08:42 +0000 - -heat (2013.2~b2-0ubuntu3) saucy; urgency=low - - * Resynchronize with debian, remaining changes: - - Add sqlite3 to heat-common depends to fix - an autopkgtest failure. - - Add autopkg tests. - - Pass the testsuite if it fails. - - -- Chuck Short Wed, 07 Aug 2013 10:36:33 -0400 - -heat (2013.2~b2-0ubuntu2) saucy; urgency=low - - * debian/control: Add sqlite3 to heat-common depends to fix - an autopkgtest failure. - - -- Chuck Short Tue, 06 Aug 2013 15:36:33 +0000 - -heat (2013.2~b2-0ubuntu1) saucy; urgency=low - - [ Yolanda Robla ] - * debian/tests: added autopkg tests - - [ Chuck Short ] - * New upstream release - * debian/control: - - Add python-pbr to build-depends. - - Add python-d2to to build-depends. - - Dropped python-argparse. - - Add python-six to build-depends. - - Dropped python-sendfile. - - Dropped python-nose. - - Added testrepository. - - Added python-testtools. - * debian/rules: Run testrepository instead of nosetets. - * debian/patches/removes-lxml-version-limitation-from-pip-requires.patch: Dropped - no longer needed. - * debian/patches/fix-package-version-detection-when-building-doc.patch: Dropped - no longer needed. - - -- Chuck Short Mon, 22 Jul 2013 16:22:29 -0400 - -heat (2013.1-4) unstable; urgency=low - - * Fixed the dbsync to the new thing upstream is using (it was crashing the - postinst). - * Fixed the prerm script of heat-engine that was calling dbc_go heat instead - of dbc_go heat-engine. - * Added missing dependency: python-mysqldb. - - -- Thomas Goirand Wed, 22 May 2013 23:57:49 +0800 - -heat (2013.1-3) unstable; urgency=low - - * Added missing dbconfig-common depends (Closes: #709126). Thanks to Andrea - Beckmann for the bug report. - - -- Thomas Goirand Tue, 21 May 2013 12:38:11 +0800 - -heat (2013.1-2) unstable; urgency=low - - * Uploading to unstable. - * Removes the <=2.3.5 from python-lxml requirements. - * Fix package version detection when building docs. - * Cleans doc/build on the clean target. - - -- Thomas Goirand Thu, 16 May 2013 13:15:54 +0000 - -heat (2013.1-1) experimental; urgency=low - - * Initial release (Closes: #695302). - - -- Thomas Goirand Mon, 04 Feb 2013 21:56:59 +0800 diff --git a/debian/compat b/debian/compat deleted file mode 100644 index ec635144..00000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -9 diff --git a/debian/control b/debian/control deleted file mode 100644 index d0ddfb52..00000000 --- a/debian/control +++ /dev/null @@ -1,216 +0,0 @@ -Source: heat -Section: web -Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: PKG OpenStack -Uploaders: - Loic Dachary (OuoU) , - Julien Danjou , - Thomas Goirand , - Ghe Rivero , - Mehdi Abaakouk -Build-Depends: - debhelper (>= 9), - python-all (>= 2.6.6-3~), - python-pbr (>= 0.6), python-pbr (<< 0.7) | python-pbr (>> 0.7), python-pbr (<< 1.0), -Build-Depends-Indep: - python-pbr (>= 0.6), python-pbr (<< 0.7) | python-pbr (>> 0.7), python-pbr (<< 1.0), - python-babel, - python-stevedore, - python-boto, - python-ceilometerclient, - python-cinderclient, - python-coverage, - python-crypto, - python-eventlet, - python-extras, - python-glanceclient, - python-greenlet, - python-heatclient, - python-httplib2, - python-iso8601, - python-keystoneclient, - python-kombu, - python-lockfile, - python-lxml, - python-memcache, - python-migrate, - python-mox, - python-netaddr, - python-neutronclient, - python-novaclient, - python-oslo.config, - python-oslo.config, - python-oslo.i18n, - python-oslo.messaging, - python-oslo.db, - python-oslosphinx, - python-paramiko, - python-paste, - python-pastedeploy, - python-routes, - python-requests, - python-saharaclient, - python-setuptools, - python-six, - python-sphinx (>= 1.1.2), python-sphinx (<< 1.2.0) | python-sphinx (>> 1.2.0), - python-sqlalchemy, - python-swiftclient, - python-testrepository, - python-testscenarios, - python-testtools, - python-troveclient, - python-webob, - python-yaml, - testrepository -Standards-Version: 3.9.4 -Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-server-dev/heat/juno/files -Vcs-Bzr: https://code.launchpad.net/~ubuntu-server-dev/heat/juno -Homepage: http://wiki.openstack.org/Heat -XS-Testsuite: autopkgtest - -Package: python-heat -Section: python -Architecture: all -Depends: - python-argparse, - python-babel (>= 1.3), - python-eventlet (>= 0.15.1), - python-greenlet (>= 0.3.2), - python-httplib2 (>= 0.7.5), - python-iso8601 (>= 0.1.9), - python-keystonemiddleware (>= 1.0.0), - python-kombu (>= 2.4.8), - 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-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-glanceclient (>= 0.14.0), - python-heatclient (>= 0.2.9), - python-keystoneclient (>= 0.10.0), - python-neutronclient (>= 1:2.3.6), - python-novaclient (>= 2.18.0), - python-saharaclient (>= 0.7.3), - python-swiftclient (>= 2.2.0), - 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-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-stevedore (>= 1.0.0), - python-webob (>= 1.2.3), - python-boto (>= 2.4), - python-extras, - python-memcache, - python-mysqldb, - python-paste, - python-setuptools, - ${misc:Depends}, - ${python:Depends} -Description: OpenStack orchestration service - Python files - 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 Python libraries. - -Package: heat-common -Architecture: all -Depends: - adduser, - python-heat (=${binary:Version}), - ${misc:Depends}, - ${python:Depends} -Description: OpenStack orchestration service - common files - 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 common files. - -Package: heat-docker -Architecture: all -Depends: - python-docker (>= 0.7.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. - -Package: heat-engine -Architecture: all -Depends: - adduser, - heat-common (=${binary:Version}), - ${misc:Depends}, - ${ostack-lsb-base}, - ${python:Depends} -Description: OpenStack orchestration service - engine - 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, which is the core service of heat, and - which the API servers will use. - -Package: heat-api -Architecture: all -Depends: - adduser, - heat-common (=${binary:Version}), - ${misc:Depends}, - ${ostack-lsb-base}, - ${python:Depends} -Description: OpenStack orchestration service - ReST API - 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 ReST API. - -Package: heat-api-cfn -Architecture: all -Depends: - adduser, - heat-common (=${binary:Version}), - ${misc:Depends}, - ${ostack-lsb-base}, - ${python:Depends} -Description: OpenStack orchestration service - CFN API - 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 CloudFormation (CFN) API. - -Package: heat-api-cloudwatch -Architecture: all -Depends: - adduser, - heat-common (=${binary:Version}), - ${misc:Depends}, - ${ostack-lsb-base}, - ${python:Depends} -Description: OpenStack orchestration service - CloudWatch API - 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 CloudWatch API. diff --git a/debian/copyright b/debian/copyright deleted file mode 100644 index 6e0954ae..00000000 --- a/debian/copyright +++ /dev/null @@ -1,47 +0,0 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: heat -Upstream-Contact: -Source: https://github.com/openstack/heat - -Files: debian/* -Copyright: 2012 Thomas Goirand -License: Apache-2 - -Files: * -Copyright: Angus Salkeld - Zane Bitter - Steven Hardy - Steven Dake - Jenkins - Chris Alfonso - Tomas Sedovic - Steve Baker - Jeff Peeler - Ian Main - Jenkins - Steve Baker - Andrew Hutchings - Mark McLoughlin - Greg Blomquist - Eoghan Glynn - root - Monty Taylor - Jesse Andrews - Jeremy Stanley -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. - You may obtain a copy of the License at - . - http://www.apache.org/licenses/LICENSE-2.0 - . - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - . - On Debian-based systems the full text of the Apache version 2.0 license - can be found in `/usr/share/common-licenses/Apache-2.0'. diff --git a/debian/gbp.conf b/debian/gbp.conf deleted file mode 100644 index 61fb874f..00000000 --- a/debian/gbp.conf +++ /dev/null @@ -1,9 +0,0 @@ -[DEFAULT] -upstream-branch = master -debian-branch = debian/havana -upstream-tag = %(version)s -compression = xz - -[git-buildpackage] -export-dir = ../build-area/ -#cleaner = true diff --git a/debian/heat-api-cfn.init b/debian/heat-api-cfn.init deleted file mode 100644 index 112c78ee..00000000 --- a/debian/heat-api-cfn.init +++ /dev/null @@ -1,87 +0,0 @@ -#!/bin/sh -### BEGIN INIT INFO -# Provides: heat-api-cfn -# Required-Start: $network $local_fs $remote_fs $syslog -# Required-Stop: $remote_fs -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: Heat CFN API -# Description: Heat CFN API server -### END INIT INFO - -# Author: Thomas Goirand - -# PATH should only include /usr/* if it runs after the mountnfs.sh script -PATH=/sbin:/usr/sbin:/bin:/usr/bin -DESC="Heat API" -NAME=heat-api-cfn -DAEMON=/usr/bin/heat-api-cfn -PIDFILE=/var/run/$NAME.pid -SCRIPTNAME=/etc/init.d/$NAME -SYSTEM_USER=heat - -# Exit if the package is not installed -[ -x $DAEMON ] || exit 0 - -. /lib/lsb/init-functions - -if [ ! -e /var/log/heat ] ; then - mkdir -p /var/log/heat - chown ${SYSTEM_USER} /var/log/heat -fi - -do_start () { - start-stop-daemon --start --background --quiet --chuid ${SYSTEM_USER}:${SYSTEM_USER} --make-pidfile --pidfile $PIDFILE --startas $DAEMON --test > /dev/null || return 1 - start-stop-daemon --start --background --quiet --chuid ${SYSTEM_USER}:${SYSTEM_USER} --make-pidfile --pidfile $PIDFILE --startas $DAEMON || return 2 -} - -do_stop () { - start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE - RETVAL="$?" - rm -f $PIDFILE - return "$RETVAL" -} - -case "$1" in - start) - log_daemon_msg "Starting $DESC" "$NAME" - do_start - case "$?" in - 0|1) log_end_msg 0 ;; - 2) log_end_msg 1 ;; - esac - ;; - stop) - log_daemon_msg "Stopping $DESC" "$NAME" - do_stop - case "$?" in - 0|1) log_end_msg 0 ;; - 2) log_end_msg 1 ;; - esac - ;; - status) - status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $? - ;; - restart|force-reload) - log_daemon_msg "Restarting $DESC" "$NAME" - do_stop - case "$?" in - 0|1) - do_start - case "$?" in - 0) log_end_msg 0 ;; - 1) log_end_msg 1 ;; # Old process is still running - *) log_end_msg 1 ;; # Failed to start - esac - ;; - *) - # Failed to stop - log_end_msg 1 - ;; - esac - ;; - *) - echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2 - exit 3 - ;; -esac diff --git a/debian/heat-api-cfn.install b/debian/heat-api-cfn.install deleted file mode 100644 index 7b207c47..00000000 --- a/debian/heat-api-cfn.install +++ /dev/null @@ -1 +0,0 @@ -usr/bin/heat-api-cfn diff --git a/debian/heat-api-cfn.logrotate b/debian/heat-api-cfn.logrotate deleted file mode 100644 index a533079f..00000000 --- a/debian/heat-api-cfn.logrotate +++ /dev/null @@ -1,4 +0,0 @@ -/var/log/heat/api-cfn.log { - daily - missingok -} diff --git a/debian/heat-api-cfn.postrm b/debian/heat-api-cfn.postrm deleted file mode 100644 index af1cb591..00000000 --- a/debian/heat-api-cfn.postrm +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh - -set -e - -if [ "${1}" = "purge" ] ; then - rm -f /etc/heat/heat-api-cfn.conf - [ -d /etc/heat ] && rmdir --ignore-fail-on-non-empty /etc/heat - rm -rf /var/log/heat/api-cfn* - [ -d /var/log/heat ] && rmdir --ignore-fail-on-non-empty /var/log/heat -fi - -#DEBHELPER# - -exit 0 diff --git a/debian/heat-api-cfn.upstart b/debian/heat-api-cfn.upstart deleted file mode 100644 index 04fa55ea..00000000 --- a/debian/heat-api-cfn.upstart +++ /dev/null @@ -1,8 +0,0 @@ -# vim: set ft=upstart ts=2 et: -description "Heat API CFN server" -author "James Page " - -start on runlevel [2345] -stop on runlevel [!2345] - -exec start-stop-daemon --start --chuid heat --exec /usr/bin/heat-api-cfn diff --git a/debian/heat-api-cloudwatch.init b/debian/heat-api-cloudwatch.init deleted file mode 100644 index f4f4f3e8..00000000 --- a/debian/heat-api-cloudwatch.init +++ /dev/null @@ -1,87 +0,0 @@ -#!/bin/sh -### BEGIN INIT INFO -# Provides: heat-api-cloudwatch -# Required-Start: $network $local_fs $remote_fs $syslog -# Required-Stop: $remote_fs -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: Heat cloudwatch API -# Description: Heat cloudwatch API server -### END INIT INFO - -# Author: Thomas Goirand - -# PATH should only include /usr/* if it runs after the mountnfs.sh script -PATH=/sbin:/usr/sbin:/bin:/usr/bin -DESC="Heat API" -NAME=heat-api-cloudwatch -DAEMON=/usr/bin/heat-api-cloudwatch -PIDFILE=/var/run/$NAME.pid -SCRIPTNAME=/etc/init.d/$NAME -SYSTEM_USER=heat - -# Exit if the package is not installed -[ -x $DAEMON ] || exit 0 - -. /lib/lsb/init-functions - -if [ ! -e /var/log/heat ] ; then - mkdir -p /var/log/heat - chown ${SYSTEM_USER} /var/log/heat -fi - -do_start () { - start-stop-daemon --start --background --quiet --chuid ${SYSTEM_USER}:${SYSTEM_USER} --make-pidfile --pidfile $PIDFILE --startas $DAEMON --test > /dev/null || return 1 - start-stop-daemon --start --background --quiet --chuid ${SYSTEM_USER}:${SYSTEM_USER} --make-pidfile --pidfile $PIDFILE --startas $DAEMON || return 2 -} - -do_stop () { - start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE - RETVAL="$?" - rm -f $PIDFILE - return "$RETVAL" -} - -case "$1" in - start) - log_daemon_msg "Starting $DESC" "$NAME" - do_start - case "$?" in - 0|1) log_end_msg 0 ;; - 2) log_end_msg 1 ;; - esac - ;; - stop) - log_daemon_msg "Stopping $DESC" "$NAME" - do_stop - case "$?" in - 0|1) log_end_msg 0 ;; - 2) log_end_msg 1 ;; - esac - ;; - status) - status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $? - ;; - restart|force-reload) - log_daemon_msg "Restarting $DESC" "$NAME" - do_stop - case "$?" in - 0|1) - do_start - case "$?" in - 0) log_end_msg 0 ;; - 1) log_end_msg 1 ;; # Old process is still running - *) log_end_msg 1 ;; # Failed to start - esac - ;; - *) - # Failed to stop - log_end_msg 1 - ;; - esac - ;; - *) - echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2 - exit 3 - ;; -esac diff --git a/debian/heat-api-cloudwatch.install b/debian/heat-api-cloudwatch.install deleted file mode 100644 index 04ac6110..00000000 --- a/debian/heat-api-cloudwatch.install +++ /dev/null @@ -1 +0,0 @@ -/usr/bin/heat-api-cloudwatch diff --git a/debian/heat-api-cloudwatch.logrotate b/debian/heat-api-cloudwatch.logrotate deleted file mode 100644 index b89b06b6..00000000 --- a/debian/heat-api-cloudwatch.logrotate +++ /dev/null @@ -1,4 +0,0 @@ -/var/log/heat/api-cloudwatch.log { - daily - missingok -} diff --git a/debian/heat-api-cloudwatch.postrm b/debian/heat-api-cloudwatch.postrm deleted file mode 100644 index e2bd0e09..00000000 --- a/debian/heat-api-cloudwatch.postrm +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh - -set -e - -if [ "${1}" = "purge" ] ; then - rm -f /etc/heat/heat-api-cloudwatch.conf - [ -d /etc/heat ] && rmdir --ignore-fail-on-non-empty /etc/heat - rm -rf /var/log/heat/api-cloudwatch* - [ -d /var/log/heat ] && rmdir --ignore-fail-on-non-empty /var/log/heat -fi - -#DEBHELPER# - -exit 0 diff --git a/debian/heat-api-cloudwatch.upstart b/debian/heat-api-cloudwatch.upstart deleted file mode 100644 index 7983c9bf..00000000 --- a/debian/heat-api-cloudwatch.upstart +++ /dev/null @@ -1,8 +0,0 @@ -# vim: set ft=upstart ts=2 et: -description "Heat API Cloudwatch server" -author "James Page " - -start on runlevel [2345] -stop on runlevel [!2345] - -exec start-stop-daemon --start --chuid heat --exec /usr/bin/heat-api-cloudwatch diff --git a/debian/heat-api.init b/debian/heat-api.init deleted file mode 100644 index 9f3db2a1..00000000 --- a/debian/heat-api.init +++ /dev/null @@ -1,86 +0,0 @@ -#!/bin/sh -### BEGIN INIT INFO -# Provides: heat-api -# Required-Start: $network $local_fs $remote_fs $syslog -# Required-Stop: $remote_fs -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: Heat API -# Description: Heat API server -### END INIT INFO -# Author: Thomas Goirand - -# PATH should only include /usr/* if it runs after the mountnfs.sh script -PATH=/sbin:/usr/sbin:/bin:/usr/bin -DESC="Heat API" -NAME=heat-api -DAEMON=/usr/bin/heat-api -PIDFILE=/var/run/$NAME.pid -SCRIPTNAME=/etc/init.d/$NAME -SYSTEM_USER=heat - -# Exit if the package is not installed -[ -x $DAEMON ] || exit 0 - -. /lib/lsb/init-functions - -if [ ! -e /var/log/heat ] ; then - mkdir -p /var/log/heat - chown ${SYSTEM_USER} /var/log/heat -fi - -do_start () { - start-stop-daemon --start --background --quiet --chuid ${SYSTEM_USER}:${SYSTEM_USER} --make-pidfile --pidfile $PIDFILE --startas $DAEMON --test > /dev/null || return 1 - start-stop-daemon --start --background --quiet --chuid ${SYSTEM_USER}:${SYSTEM_USER} --make-pidfile --pidfile $PIDFILE --startas $DAEMON || return 2 -} - -do_stop () { - start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE - RETVAL="$?" - rm -f $PIDFILE - return "$RETVAL" -} - -case "$1" in - start) - log_daemon_msg "Starting $DESC" "$NAME" - do_start - case "$?" in - 0|1) log_end_msg 0 ;; - 2) log_end_msg 1 ;; - esac - ;; - stop) - log_daemon_msg "Stopping $DESC" "$NAME" - do_stop - case "$?" in - 0|1) log_end_msg 0 ;; - 2) log_end_msg 1 ;; - esac - ;; - status) - status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $? - ;; - restart|force-reload) - log_daemon_msg "Restarting $DESC" "$NAME" - do_stop - case "$?" in - 0|1) - do_start - case "$?" in - 0) log_end_msg 0 ;; - 1) log_end_msg 1 ;; # Old process is still running - *) log_end_msg 1 ;; # Failed to start - esac - ;; - *) - # Failed to stop - log_end_msg 1 - ;; - esac - ;; - *) - echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2 - exit 3 - ;; -esac diff --git a/debian/heat-api.install b/debian/heat-api.install deleted file mode 100644 index 16eff75f..00000000 --- a/debian/heat-api.install +++ /dev/null @@ -1 +0,0 @@ -usr/bin/heat-api diff --git a/debian/heat-api.logrotate b/debian/heat-api.logrotate deleted file mode 100644 index 2a03cdbb..00000000 --- a/debian/heat-api.logrotate +++ /dev/null @@ -1,4 +0,0 @@ -/var/log/heat/api.log { - daily - missingok -} diff --git a/debian/heat-api.postrm b/debian/heat-api.postrm deleted file mode 100644 index de9e1c4a..00000000 --- a/debian/heat-api.postrm +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh - -set -e - -if [ "${1}" = "purge" ] ; then - rm -f /etc/heat/heat-api.conf - [ -d /etc/heat ] && rmdir --ignore-fail-on-non-empty /etc/heat - rm -rf /var/log/heat/api.* - [ -d /var/log/heat ] && rmdir --ignore-fail-on-non-empty /var/log/heat -fi - -#DEBHELPER# - -exit 0 diff --git a/debian/heat-api.upstart b/debian/heat-api.upstart deleted file mode 100644 index af5b3221..00000000 --- a/debian/heat-api.upstart +++ /dev/null @@ -1,8 +0,0 @@ -# vim: set ft=upstart ts=2 et: -description "Heat API server" -author "James Page " - -start on runlevel [2345] -stop on runlevel [!2345] - -exec start-stop-daemon --start --chuid heat --exec /usr/bin/heat-api diff --git a/debian/heat-common.dirs b/debian/heat-common.dirs deleted file mode 100644 index e819f2bf..00000000 --- a/debian/heat-common.dirs +++ /dev/null @@ -1,5 +0,0 @@ -var/log/heat -var/lib/heat -etc/heat -etc/heat/environment.d -etc/heat/templates diff --git a/debian/heat-common.install b/debian/heat-common.install deleted file mode 100644 index 26d5e765..00000000 --- a/debian/heat-common.install +++ /dev/null @@ -1,7 +0,0 @@ -/usr/bin/heat-manage -/usr/bin/heat-keystone-setup -etc/heat/policy.json -etc/heat/api-paste.ini -etc/heat/heat.conf etc/heat -etc/heat/templates/* etc/heat/templates/ -etc/heat/environment.d/* etc/heat/environment.d/ diff --git a/debian/heat-common.postinst b/debian/heat-common.postinst deleted file mode 100644 index 79c47746..00000000 --- a/debian/heat-common.postinst +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh - -set -e - -if [ "$1" = "configure" ] ; then - if ! getenv group heat > /dev/null 2>&1; then - addgroup --system heat >/dev/null - fi - if ! getenv passwd heat > /dev/null 2>&1; then - adduser --system --home /var/lib/heat --ingroup heat --no-create-home \ - --shell /bin/false heat - fi - chown -R heat:adm /var/log/heat - mkdir -p /etc/heat - chmod 0750 /var/log/heat /etc/heat - mkdir -p /var/lib/heat - chown heat:heat -R /var/lib/heat /etc/heat -fi - -#DEBHELPER# - -exit 0 diff --git a/debian/heat-common.postrm b/debian/heat-common.postrm deleted file mode 100644 index f90e6ae1..00000000 --- a/debian/heat-common.postrm +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh - -set -e - -if [ "${1}" = "purge" ] ; then - [ -d /etc/heat ] && rmdir --ignore-fail-on-non-empty /etc/heat - rm -rf /var/log/heat/engine* - [ -d /var/log/heat ] && rmdir --ignore-fail-on-non-empty /var/log/heat - [ -d /var/lib/heat/cache ] && rmdir --ignore-fail-on-non-empty /var/lib/heat/cache - [ -d /var/lib/heat ] && rmdir --ignore-fail-on-non-empty /var/lib/heat -fi - -#DEBHELPER# - -exit 0 diff --git a/debian/heat-docker.dirs b/debian/heat-docker.dirs deleted file mode 100644 index aee75347..00000000 --- a/debian/heat-docker.dirs +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/heat/docker diff --git a/debian/heat-docker.install b/debian/heat-docker.install deleted file mode 100644 index 16f88330..00000000 --- a/debian/heat-docker.install +++ /dev/null @@ -1 +0,0 @@ -contrib/heat_docker/heat_docker/* /usr/lib/heat/docker diff --git a/debian/heat-engine.init b/debian/heat-engine.init deleted file mode 100644 index ba201d7e..00000000 --- a/debian/heat-engine.init +++ /dev/null @@ -1,87 +0,0 @@ -#!/bin/sh -### BEGIN INIT INFO -# Provides: heat-engine -# Required-Start: $network $local_fs $remote_fs $syslog -# Required-Stop: $remote_fs -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: Heat Engine -# Description: Heat Engine server -### END INIT INFO - -# Author: Thomas Goirand - -# PATH should only include /usr/* if it runs after the mountnfs.sh script -PATH=/sbin:/usr/sbin:/bin:/usr/bin -DESC="Heat Engine" -NAME=heat-engine -DAEMON=/usr/bin/heat-engine -PIDFILE=/var/run/$NAME.pid -SCRIPTNAME=/etc/init.d/$NAME -SYSTEM_USER=heat - -# Exit if the package is not installed -[ -x $DAEMON ] || exit 0 - -. /lib/lsb/init-functions - -if [ ! -e /var/log/heat ] ; then - mkdir -p /var/log/heat - chown ${SYSTEM_USER} /var/log/heat -fi - -do_start () { - start-stop-daemon --start --background --quiet --chuid ${SYSTEM_USER}:${SYSTEM_USER} --make-pidfile --pidfile $PIDFILE --startas $DAEMON --test > /dev/null || return 1 - start-stop-daemon --start --background --quiet --chuid ${SYSTEM_USER}:${SYSTEM_USER} --make-pidfile --pidfile $PIDFILE --startas $DAEMON || return 2 -} - -do_stop () { - start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE - RETVAL="$?" - rm -f $PIDFILE - return "$RETVAL" -} - -case "$1" in - start) - log_daemon_msg "Starting $DESC" "$NAME" - do_start - case "$?" in - 0|1) log_end_msg 0 ;; - 2) log_end_msg 1 ;; - esac - ;; - stop) - log_daemon_msg "Stopping $DESC" "$NAME" - do_stop - case "$?" in - 0|1) log_end_msg 0 ;; - 2) log_end_msg 1 ;; - esac - ;; - status) - status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $? - ;; - restart|force-reload) - log_daemon_msg "Restarting $DESC" "$NAME" - do_stop - case "$?" in - 0|1) - do_start - case "$?" in - 0) log_end_msg 0 ;; - 1) log_end_msg 1 ;; # Old process is still running - *) log_end_msg 1 ;; # Failed to start - esac - ;; - *) - # Failed to stop - log_end_msg 1 - ;; - esac - ;; - *) - echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2 - exit 3 - ;; -esac diff --git a/debian/heat-engine.install b/debian/heat-engine.install deleted file mode 100644 index 20db4659..00000000 --- a/debian/heat-engine.install +++ /dev/null @@ -1 +0,0 @@ -usr/bin/heat-engine diff --git a/debian/heat-engine.logrotate b/debian/heat-engine.logrotate deleted file mode 100644 index eebdeeea..00000000 --- a/debian/heat-engine.logrotate +++ /dev/null @@ -1,4 +0,0 @@ -/var/log/heat/engine.log { - daily - missingok -} diff --git a/debian/heat-engine.postinst b/debian/heat-engine.postinst deleted file mode 100644 index 3722653e..00000000 --- a/debian/heat-engine.postinst +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -set -e - - -#if [ "$1" = "configure" ] ; then -# su -s /bin/sh -c "heat-manage db_sync" heat -#fi - -#DEBHELPER# - -exit 0 diff --git a/debian/heat-engine.postrm b/debian/heat-engine.postrm deleted file mode 100644 index a4fe1e41..00000000 --- a/debian/heat-engine.postrm +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh - -set -e - -if [ "${1}" = "purge" ] ; then - rm -f /etc/heat/heat-engine.conf - [ -d /etc/heat ] && rmdir --ignore-fail-on-non-empty /etc/heat - rm -rf /var/log/heat/engine* - [ -d /var/log/heat ] && rmdir --ignore-fail-on-non-empty /var/log/heat -fi - -#DEBHELPER# - -exit 0 diff --git a/debian/heat-engine.upstart b/debian/heat-engine.upstart deleted file mode 100644 index bd9b6348..00000000 --- a/debian/heat-engine.upstart +++ /dev/null @@ -1,8 +0,0 @@ -# vim: set ft=upstart ts=2 et: -description "Heat Engine server" -author "James Page " - -start on runlevel [2345] -stop on runlevel [!2345] - -exec start-stop-daemon --start --chuid heat --exec /usr/bin/heat-engine diff --git a/debian/patches/default-sqlite.patch b/debian/patches/default-sqlite.patch deleted file mode 100644 index dcdc1915..00000000 --- a/debian/patches/default-sqlite.patch +++ /dev/null @@ -1,19 +0,0 @@ -Description: Default to using sqlite -Author: James Page -Forwarded: not-needed ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ -diff --git a/etc/heat/heat.conf.sample b/etc/heat/heat.conf.sample -index d2ca058..658cb5a 100644 ---- a/etc/heat/heat.conf.sample -+++ b/etc/heat/heat.conf.sample -@@ -809,7 +809,7 @@ - # Deprecated group/name - [DEFAULT]/sql_connection - # Deprecated group/name - [DATABASE]/sql_connection - # Deprecated group/name - [sql]/connection --#connection= -+connection=sqlite:////var/lib/heat/$sqlite_db - - # The SQL mode to be used for MySQL sessions. This option, - # including the default, overrides any server-set SQL mode. To - diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index e69de29b..00000000 diff --git a/debian/patches/skip-tests.patch b/debian/patches/skip-tests.patch deleted file mode 100644 index 2be91ffa..00000000 --- a/debian/patches/skip-tests.patch +++ /dev/null @@ -1,43 +0,0 @@ -Description: Skip tests that fail in the buildds. -Author: Chuck Short -Forwarded: No -diff --git a/heat/tests/test_server.py b/heat/tests/test_server.py -index fabd8d8..c115c85 100644 ---- a/heat/tests/test_server.py -+++ b/heat/tests/test_server.py -@@ -646,7 +646,10 @@ class ServersTest(HeatTestCase): - - update_template = copy.deepcopy(server.t) - update_template['Properties']['image'] = self.getUniqueString() -- updater = scheduler.TaskRunner(server.update, update_template) -+ try: -+ updater = scheduler.TaskRunner(server.update, update_template) -+ except: -+ self.skipTest('Skipped by Ubuntu') - self.assertRaises(resource.UpdateReplace, updater) - - def _test_server_update_image_rebuild(self, status, policy='REBUILD'): -@@ -678,7 +681,10 @@ class ServersTest(HeatTestCase): - return_server.get = activate_status.__get__(return_server) - - self.m.ReplayAll() -- scheduler.TaskRunner(server.update, update_template)() -+ try: -+ scheduler.TaskRunner(server.update, update_template)() -+ except: -+ self.skipTest('Skipped by Ubuntu') - self.assertEqual(server.state, (server.UPDATE, server.COMPLETE)) - self.m.VerifyAll() - -@@ -729,7 +735,10 @@ class ServersTest(HeatTestCase): - return_server.get = activate_status2.__get__(return_server) - self.m.ReplayAll() - updater = scheduler.TaskRunner(server.update, update_template) -- error = self.assertRaises(exception.ResourceFailure, updater) -+ try: -+ error = self.assertRaises(exception.ResourceFailure, updater) -+ except: -+ self.skipTest('Skipped by Ubuntu') - self.assertEqual( - "Error: Rebuilding server failed, status 'ERROR'", - str(error)) diff --git a/debian/patches/sudoers_patch.patch b/debian/patches/sudoers_patch.patch deleted file mode 100644 index 816a17f7..00000000 --- a/debian/patches/sudoers_patch.patch +++ /dev/null @@ -1,17 +0,0 @@ -Description: Change sudoers directory to be sudoers.d -Author: Chuck Short -Forwarded: Not needed. -diff -Naurp heat-2014.1.rc2.orig/heat/engine/resources/nova_utils.py heat-2014.1.rc2/heat/engine/resources/nova_utils.py ---- heat-2014.1.rc2.orig/heat/engine/resources/nova_utils.py 2014-04-10 03:27:34.000000000 -0400 -+++ heat-2014.1.rc2/heat/engine/resources/nova_utils.py 2014-04-11 15:33:08.870985000 -0400 -@@ -198,8 +198,8 @@ def build_userdata(resource, userdata=No - # - # See bug https://bugs.launchpad.net/heat/+bug/1257410 - boothook_custom_user = r"""useradd -m %s --echo -e '%s\tALL=(ALL)\tNOPASSWD: ALL' >> /etc/sudoers --""" % (instance_user, instance_user) -+echo -e '%s\tALL=(ALL)\tNOPASSWD: ALL' >> /etc/sudoers.d/heat-instance-%s -+""" % (instance_user, instance_user, instance_user) - else: - config_custom_user = '' - boothook_custom_user = '' diff --git a/debian/pydist-overrides b/debian/pydist-overrides deleted file mode 100644 index c6c79ced..00000000 --- a/debian/pydist-overrides +++ /dev/null @@ -1,3 +0,0 @@ -argparse python-argparse -posix_ipc python-posix-ipc -qpid_python python-qpid diff --git a/debian/python-heat.install b/debian/python-heat.install deleted file mode 100644 index 036c6b9d..00000000 --- a/debian/python-heat.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/python*/dist-packages/* diff --git a/debian/rules b/debian/rules deleted file mode 100755 index ded8fd27..00000000 --- a/debian/rules +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/make -f - -#export DH_VERBOSE=1 -DESTDIR := $(CURDIR)/debian/heat -%: - dh $@ --with python2 - -ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS))) -override_dh_auto_test: - PYTHONPATH=. testr init && testr run -endif - -override_dh_clean: - dh_clean - rm -rf heat.egg-info - rm -rf doc/build - find . -iname '*.pyc' -delete - rm -f run_tests.err.log - rm -rf pbr*.egg - rm -f etc/heat/heat.conf - -override_dh_install: - cp etc/heat/heat.conf.sample etc/heat/heat.conf - dh_install diff --git a/debian/source/format b/debian/source/format deleted file mode 100644 index 163aaf8d..00000000 --- a/debian/source/format +++ /dev/null @@ -1 +0,0 @@ -3.0 (quilt) diff --git a/debian/tests/control b/debian/tests/control deleted file mode 100644 index f691333d..00000000 --- a/debian/tests/control +++ /dev/null @@ -1,3 +0,0 @@ -Tests: python-heat heat-daemons -Depends: python-heat, heat-engine, heat-api, heat-api-cfn, heat-api-cloudwatch -Restrictions: needs-root diff --git a/debian/tests/heat-daemons b/debian/tests/heat-daemons deleted file mode 100755 index b4952613..00000000 --- a/debian/tests/heat-daemons +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -#--------------------- -# Testing nova-daemons -#--------------------- -set -e -DAEMONS=('heat-engine' 'heat-api' 'heat-api-cfn' 'heat-api-cloudwatch') - -for daemon in "${DAEMONS[@]}"; do - if pidof -x $daemon > /dev/null; then - echo "OK" - else - echo "ERROR: ${daemon} IS NOT RUNNING" - exit 1 - fi -done diff --git a/debian/tests/python-heat b/debian/tests/python-heat deleted file mode 100755 index de2504d1..00000000 --- a/debian/tests/python-heat +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash -#------------------------- -# Testing client utilities -#------------------------- -set -e - -result=$(python `dirname $0`/test_import_heat.py 2>&1) -if [ "$result" ]; then - echo "ERROR: PYTHON-HEAT MODULE CANNOT BE IMPORTED" - exit 1 -else - echo "OK" - exit 0 -fi diff --git a/debian/tests/test_import_heat.py b/debian/tests/test_import_heat.py deleted file mode 100644 index 538ccf19..00000000 --- a/debian/tests/test_import_heat.py +++ /dev/null @@ -1,4 +0,0 @@ -try: - import heat -except ImportError, e: - print "ERROR IMPORTING MODULE" diff --git a/debian/watch b/debian/watch deleted file mode 100644 index b8f101b7..00000000 --- a/debian/watch +++ /dev/null @@ -1,3 +0,0 @@ -version=3 -opts="uversionmangle=s/\.([a-zA-Z])/~$1/;s/%7E/~/" \ - https://launchpad.net/heat/+download https://launchpad.net/heat/.*/.*/.*/heat-(.*)\.tar\.gz diff --git a/rpm/SPECS/openstack-heat.spec b/rpm/SPECS/openstack-heat.spec index 17391cca..61436a6f 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 @@ -54,7 +54,7 @@ BuildRequires: python-paramiko BuildRequires: python-sphinx >= 1.2.1, python-sphinx < 1.3 # These are required to build due to the requirements check added BuildRequires: python-paste-deploy >= 1.5.0 -BuildRequires: python-routes >= 1.12.3, python-routes < 2.0 +BuildRequires: python-routes >= 1.12.3 BuildRequires: python-sqlalchemy >= 0.8.4, python-sqlalchemy <= 0.9.99 BuildRequires: python-webob >= 1.2.3 @@ -179,34 +179,35 @@ 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-config >= 1: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-glanceclient >= 0.14.0 +Requires: python-cinderclient >= 1.1.0 +Requires: python-glanceclient >= 1:0.14.0 Requires: python-heatclient >= 0.2.9 -Requires: python-keystoneclient >= 0.10.0 +Requires: python-keystoneclient >= 1:0.10.0 Requires: python-neutronclient >= 2.3.6, python-neutronclient < 3 -Requires: python-novaclient >= 2.18.0 +Requires: python-novaclient >= 1:2.18.0 Requires: python-saharaclient >= 0.7.3 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-routes >= 1.12.3, python-routes < 2.0, python-routes > 2.0 +Requires: python-requests >= 2.1.0, python-requests < 2.2.0 +Requires: python-routes >= 1.12.3 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 @@ -423,6 +424,9 @@ fi %changelog +* Mon Mar 02 2015 Mikhail Ivanov - 2014.2.2 +- update from global requirements + * Wed Dec 31 2014 Igor Yozhikov - 2014.2.b2 - update docker resource python script location according to LP 1404911 diff --git a/tests/runtests.sh b/tests/runtests.sh index 10ff0772..5684814d 100755 --- a/tests/runtests.sh +++ b/tests/runtests.sh @@ -9,12 +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 mysql-client python-mysqldb rabbitmq-server + apt-get install -y screen mysql-server mysql-client python-mysqldb rabbitmq-server curl else 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 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 diff --git a/trusty/debian/changelog b/trusty/debian/changelog index 799f754d..e9d815e8 100644 --- a/trusty/debian/changelog +++ b/trusty/debian/changelog @@ -1,3 +1,9 @@ +heat (2014.2.2-fuel6.1+14.04+2) trusty; urgency=medium + + * Update requirements + + -- Mikhail Ivanov Thu, 12 Mar 2015 19:57:11 +0400 + heat (2014.2.2-fuel6.1+14.04+1) trusty; urgency=medium * Build from tag 2014.2.2 for Ubuntu 14.04 by Mirantis diff --git a/trusty/debian/control b/trusty/debian/control index 9fe2704e..2fbd742a 100644 --- a/trusty/debian/control +++ b/trusty/debian/control @@ -70,34 +70,35 @@ Depends: python-httplib2 (>= 0.7.5), python-iso8601 (>= 0.1.9), python-keystonemiddleware (>= 1.0.0), - python-kombu (>= 2.4.8), + python-kombu (>= 2.5.0), python-lxml (>= 2.3), python-netaddr (>= 0.7.12), - python-oslo.config (>= 1.4.0), + python-oslo.config (>= 1: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.10.0), python-posix-ipc, python-crypto (>= 2.6), python-ceilometerclient (>= 1.0.6), - python-cinderclient (>= 1.0.7), - python-glanceclient (>= 0.14.0), + python-cinderclient (>= 1:1.1.0), + python-glanceclient (>= 1:0.14.0), python-heatclient (>= 0.2.9), - python-keystoneclient (>= 0.10.0), + python-keystoneclient (>= 1:0.10.0), python-neutronclient (>= 1:2.3.6), - python-novaclient (>= 2.18.0), + python-novaclient (>= 1:2.18.0), python-saharaclient (>= 0.7.3), - python-swiftclient (>= 2.2.0), - python-troveclient (>= 1.0.4), + python-swiftclient (>= 1:2.2.0), + python-troveclient (>= 1:1.0.4), python-yaml (>= 3.1.0), python-qpid, - python-requests (>= 1.2.1), + python-requests (>= 2.1.0), python-routes (>= 1.12.3), python-six (>= 1.7.0), - 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-sqlalchemy (>= 0.9.7), + python-migrate (>= 0.9.1), python-stevedore (>= 1.0.0), python-webob (>= 1.2.3), python-boto (>= 2.4), diff --git a/trusty/debian/patches/requirements-built-in.patch b/trusty/debian/patches/requirements-built-in.patch index b29c6dea..d4456aa5 100644 --- a/trusty/debian/patches/requirements-built-in.patch +++ b/trusty/debian/patches/requirements-built-in.patch @@ -1,19 +1,29 @@ ---- heat/requirements.txt 2015-02-25 20:53:22.805336790 +0300 -+++ ./requirements.txt 2015-02-25 20:54:33.933336602 +0300 -@@ -3,7 +3,6 @@ +diff --git a/requirements.txt b/requirements.txt +index 16e102b..3ecb714 100644 +--- a/requirements.txt ++++ b/requirements.txt +@@ -3,14 +3,13 @@ # process, which may cause wedges in the gate later. pbr>=0.6,!=0.7,<1.0 -argparse - Babel>=1.3 - eventlet>=0.15.1,<0.16.0 - greenlet>=0.3.2 -@@ -34,7 +33,7 @@ - PyYAML>=3.1.0 - qpid-python - requests>=1.2.1,!=2.4.0 --Routes>=1.12.3,!=2.0 -+Routes>=1.12.3 - six>=1.7.0 + Babel>=1.3,<=1.3 + eventlet>=0.15.1,<=0.15.2 + greenlet>=0.3.2,<=0.4.2 + httplib2>=0.7.5,<=0.9 + iso8601>=0.1.9,<=0.1.10 + keystonemiddleware>=1.0.0,<1.4.0 +-kombu>=2.5.0,<=3.0.7 ++kombu>=2.5.0,<=3.0.16 + lxml>=2.3,<=3.3.3 + netaddr>=0.7.12,<=0.7.13 + oslo.config>=1.4.0,<=1.6.0 # Apache-2.0 +@@ -34,7 +33,7 @@ python-troveclient>=1.0.4,<=1.0.8 + PyYAML>=3.1.0,<=3.10 + qpid-python<=0.26.1 + requests>=2.1.0,!=2.4.0,<=2.2.1 +-Routes>=1.12.3,!=2.0,<=2.1 ++Routes>=1.12.3,<=2.1 + six>=1.7.0,<=1.9.0 SQLAlchemy>=0.8.4,<=0.9.99,!=0.9.0,!=0.9.1,!=0.9.2,!=0.9.3,!=0.9.4,!=0.9.5,!=0.9.6 sqlalchemy-migrate==0.9.1 -- 2.45.2