Merge lp:~corey.bryant/heat/2015.1-b1 into lp:~ubuntu-server-dev/heat/kilo

[Corey Bryant]

=== modified file 'debian/changelog'
--- debian/changelog	2014-11-21 14:56:07 +0000
+++ debian/changelog	2015-01-05 20:56:20 +0000
@@ -1,5 +1,6 @@
-heat (2014.2-0ubuntu2) UNRELEASED; urgency=medium
+heat (2015.1~b1-0ubuntu1) UNRELEASED; urgency=medium
 
+  [ Chuck Short ]
   * Open up for vivid.
   * debian/control: Update bzr branch. 
   * debian/control: Add python-saharaclient,
@@ -8,7 +9,17 @@
   * debian/patches/skip-tests.patch: Updated to skip more tests.
   * debian/rules: Skip integration tests.
 
- -- Chuck Short <[e-mail]>  Tue, 28 Oct 2014 10:00:07 -0400
+  [ Corey Bryant ]
+  * New upstream release.
+    - d/control: Align requirements with upstream.
+    - d/watch: Update uversionmangle for kilo beta naming.
+    - d/rules: Generate heat.conf.sample and apply patch before copy.
+    - d/rules: Run base tests instead of integration tests.
+    - d/p/fix-requirements.patch: Refreshed.
+    - d/p/remove-gettextutils-import.patch: Cherry picked from master.
+  * d/control: Bumped Standards-Version to 3.9.6.
+
+ -- Corey Bryant <[e-mail]>  Fri, 19 Dec 2014 17:16:01 -0500
 
 heat (2014.2-0ubuntu1) utopic; urgency=medium
 

=== modified file 'debian/control'
--- debian/control	2014-11-19 18:03:00 +0000
+++ debian/control	2015-01-05 20:56:20 +0000
@@ -18,20 +18,20 @@
  python-babel (>= 1.3),
  python-boto (>= 2.4),
  python-ceilometerclient (>= 1.0.6),
- python-cinderclient (>= 1:1.0.7),
+ python-cinderclient (>= 1:1.1.0),
  python-coverage (>= 3.6),
  python-crypto (>= 2.6),
- python-eventlet (>= 0.13.0),
+ python-eventlet (>= 0.15.2),
  python-extras,
- python-glanceclient (>= 1:0.14.0),
+ python-glanceclient (>= 1:0.15.0),
  python-greenlet (>= 0.3.2),
  python-hacking (>= 0.8.0),
  python-heatclient (>= 0.2.9),
  python-httplib2 (>= 0.7.5),
  python-iso8601 (>= 0.1.9),
- python-keystoneclient (>= 1:0.10.0),
+ python-keystoneclient (>= 1:0.11.1),
  python-keystonemiddleware (>= 1.0.0),
- python-kombu (>=2.4.8),
+ python-kombu (>=2.5.0),
  python-lockfile (>= 0.8),
  python-lxml (>= 2.3),
  python-memcache,
@@ -42,14 +42,14 @@
  python-netaddr (>= 0.7.12),
  python-neutronclient (>= 1:2.3.6),
  python-novaclient (>= 1:2.18.0),
- python-osprofiler,
- python-oslo.middleware,
- python-oslo.serialization,
+ python-osprofiler (>= 0.3.0),
+ python-oslo.middleware (>= 0.1.0),
+ python-oslo.serialization (>= 1.0.0),
  python-oslo.config (>= 1:1.4.0),
- python-oslo.db (>= 1.0.0),
+ python-oslo.db (>= 1.1.0),
  python-oslo.i18n (>= 1.0.0),
  python-oslo.messaging (>= 1.4.0),
- python-oslo.utils (>= 1.0.0),
+ python-oslo.utils (>= 1.1.0),
  python-oslosphinx (>= 2.2.0),
  python-oslotest (>= 1:1.1.0),
  python-posix-ipc,
@@ -57,25 +57,24 @@
  python-paste,
  python-pastedeploy (>= 1.5.0),
  python-psycopg2,
- python-requests (>= 1.2.1),
+ python-requests (>= 2.2.0),
  python-routes (>= 1.12.3),
- python-saharaclient (>= 0.7.3),
+ python-saharaclient (>= 0.7.6),
  python-setuptools,
- python-saharaclient,
- python-stevedore (>= 1.0.0),
+ python-stevedore (>= 1.1.0),
  python-six (>= 1.7.0),
  python-sphinx (>= 1.1.2),
- python-sqlalchemy (>= 0.8.4),
+ python-sqlalchemy (>= 0.9.7),
  python-swiftclient (>= 2.2.0),
  python-testrepository (>= 0.0.18),
  python-testscenarios (>= 0.4),
  python-testtools (>= 0.9.34),
- python-troveclient (>= 1:1.0.4),
+ python-troveclient (>= 1:1.0.7),
  python-webob (>= 1.2.3),
  python-yaml (>= 3.1.0),
  subunit,
  testrepository (>= 0.0.18),
-Standards-Version: 3.9.4
+Standards-Version: 3.9.6
 Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-server-dev/heat/kilo/files
 Vcs-Bzr: https://code.launchpad.net/~ubuntu-server-dev/heat/kilo
 Homepage: http://wiki.openstack.org/Heat
@@ -89,20 +88,20 @@
  python-babel (>= 1.3),
  python-boto (>= 2.4),
  python-ceilometerclient (>= 1.0.6),
- python-cinderclient (>= 1:1.0.7),
+ python-cinderclient (>= 1:1.1.0),
  python-coverage (>= 3.6),
  python-crypto (>= 2.6),
- python-eventlet (>= 0.13.0),
+ python-eventlet (>= 0.15.2),
  python-extras,
- python-glanceclient (>= 1:0.14.0),
+ python-glanceclient (>= 1:0.15.0),
  python-greenlet (>= 0.3.2),
  python-httplib2 (>= 0.7.5),
  python-iso8601 (>= 0.1.9),
  python-hacking (>= 0.8.0),
  python-heatclient (>= 0.2.9),
- python-keystoneclient (>= 1:0.10.0),
+ python-keystoneclient (>= 1:0.11.1),
  python-keystonemiddleware (>= 1.0.0),
- python-kombu (>=2.4.8),
+ python-kombu (>=2.5.0),
  python-lockfile (>= 0.8),
  python-lxml (>= 2.3),
  python-memcache,
@@ -111,27 +110,30 @@
  python-netaddr (>= 0.7.12),
  python-neutronclient (>= 1:2.3.6),
  python-novaclient (>= 1:2.18.0),
+ python-osprofiler (>= 0.3.0),
  python-oslo.config (>= 1:1.4.0),
- python-oslo.db (>= 1.0.0),
+ python-oslo.db (>= 1.1.0),
  python-oslo.i18n (>= 1.0.0),
  python-oslo.messaging (>= 1.4.0),
- python-oslo.utils (>= 1.0.0),
+ python-oslo.middleware (>= 0.1.0),
+ python-oslo.serialization (>= 1.0.0),
+ python-oslo.utils (>= 1.1.0),
  python-oslosphinx (>= 2.2.0),
  python-paste,
  python-pastedeploy (>= 1.5.0),
  python-pbr (>= 0.6),
  python-posix-ipc,
  python-psycopg2,
- python-requests (>= 1.2.1),
+ python-requests (>= 2.2.0),
  python-routes (>= 1.12.3),
- python-saharaclient (>= 0.7.3),
+ python-saharaclient (>= 0.7.6),
  python-setuptools,
  python-six (>= 1.7.0),
  python-sphinx (>= 1.1.2),
- python-sqlalchemy (>= 0.8.4),
- python-stevedore (>= 1.0.0),
+ python-sqlalchemy (>= 0.9.7),
+ python-stevedore (>= 1.1.0),
  python-swiftclient (>= 2.2.0),
- python-troveclient (>= 1:1.0.4),
+ python-troveclient (>= 1:1.0.7),
  python-webob (>= 1.2.3),
  python-yaml (>= 3.1.0),
  ${misc:Depends},

=== modified file 'debian/patches/default-log-dir.patch'
--- debian/patches/default-log-dir.patch	2014-10-09 15:38:53 +0000
+++ debian/patches/default-log-dir.patch	2015-01-05 20:56:20 +0000
@@ -1,5 +1,5 @@
---- a/etc/heat/heat.conf.sample
-+++ b/etc/heat/heat.conf.sample
+--- etc/heat/heat.conf.sample
++++ etc/heat/heat.conf.sample
 @@ -505,7 +505,7 @@
  # (Optional) The base directory used for relative --log-file
  # paths. (string value)

=== modified file 'debian/patches/fix-requirements.patch'
--- debian/patches/fix-requirements.patch	2014-11-19 18:03:00 +0000
+++ debian/patches/fix-requirements.patch	2015-01-05 20:56:20 +0000
@@ -1,8 +1,6 @@
-diff --git a/requirements.txt b/requirements.txt
-index 61e4a31..a63133a 100644
 --- a/requirements.txt
 +++ b/requirements.txt
-@@ -35,9 +35,8 @@ python-saharaclient>=0.7.5
+@@ -35,11 +35,10 @@
  python-swiftclient>=2.2.0
  python-troveclient>=1.0.7
  PyYAML>=3.1.0
@@ -11,6 +9,8 @@
 -Routes>=1.12.3,!=2.0
 +Routes>=1.12.3
  six>=1.7.0
- SQLAlchemy>=0.8.4,<=0.8.99,>=0.9.7,<=0.9.99
- sqlalchemy-migrate>=0.9.1,!=0.9.2
-
+ SQLAlchemy>=0.9.7,<=0.9.99
+-sqlalchemy-migrate>=0.9.1,!=0.9.2
++sqlalchemy-migrate>=0.9.1
+ stevedore>=1.1.0  # Apache-2.0
+ WebOb>=1.2.3

=== added file 'debian/patches/remove-gettextutils-import.patch'
--- debian/patches/remove-gettextutils-import.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/remove-gettextutils-import.patch	2015-01-05 20:56:20 +0000
@@ -0,0 +1,31 @@
+From 213ed63a240e04cdbf757a7379a69b47452113b6 Mon Sep 17 00:00:00 2001
+From: Tetiana Lashchova <[e-mail]>
+Date: Fri, 19 Dec 2014 16:19:55 +0200
+Subject: [PATCH] Remove gettextutils import
+
+Change-Id: I48846926cc5eb2a1f81db6a2becb310bdf61daa7
+Closes-Bug: #1404206
+---
+ heat/openstack/common/config/generator.py | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/heat/openstack/common/config/generator.py b/heat/openstack/common/config/generator.py
+index 43113b3..0bf9849 100644
+--- a/heat/openstack/common/config/generator.py
++++ b/heat/openstack/common/config/generator.py
+@@ -31,12 +31,9 @@ from oslo.config import cfg
+ import six
+ import stevedore.named
+ 
+-from heat.openstack.common import gettextutils
+ from heat.common import i18n
+ from heat.openstack.common import importutils
+ 
+-gettextutils.install('heat')
+-
+ STROPT = "StrOpt"
+ BOOLOPT = "BoolOpt"
+ INTOPT = "IntOpt"
+-- 
+2.1.0
+

=== modified file 'debian/patches/series'
--- debian/patches/series	2014-07-21 09:40:58 +0000
+++ debian/patches/series	2015-01-05 20:56:20 +0000
@@ -1,4 +1,5 @@
+remove-gettextutils-import.patch
 #default-sqlite.patch
 fix-requirements.patch
 sudoers_patch.patch
-default-log-dir.patch
+#default-log-dir.patch

=== modified file 'debian/rules'
--- debian/rules	2014-11-21 14:56:07 +0000
+++ debian/rules	2015-01-05 20:56:20 +0000
@@ -11,7 +11,7 @@
 	testr init && \
 	set -e && \
 	TEMP_REZ=`mktemp -t` && \
-	testr run --testr-args='--concurrency=1 ^heat_integrationtests' --subunit | tee $$TEMP_REZ | subunit2pyunit; \
+	testr run --subunit '^(?!heat_integrationtests)' | tee $$TEMP_REZ | subunit2pyunit; \
 	rm -f $$TEMP_REZ
 endif
 
@@ -25,6 +25,8 @@
 	rm -f etc/heat/heat.conf
 
 override_dh_install:
+	bash tools/config/generate_sample.sh -b . -p heat -o etc/heat
+	patch -p0 < debian/patches/default-log-dir.patch
 	cp etc/heat/heat.conf.sample etc/heat/heat.conf
 	dh_install
 

=== modified file 'debian/watch'
--- debian/watch	2014-10-09 15:00:05 +0000
+++ debian/watch	2015-01-05 20:56:20 +0000
@@ -1,3 +1,3 @@
 version=3
-opts="uversionmangle=s/\.([a-zA-Z])/~$1/;s/%7E/~/" \
+opts="uversionmangle=s/\.([a-zA-Z])/~$1/;s/%7E/~/;s/\.0b/~b/" \
  http://tarballs.openstack.org/heat heat-(\d.*)\.tar\.gz