Build the heat.conf.sample on the fly at build time.

Rewritten-From: ffb6dce23a467704cbcecf7d24afdfcd20ce8080

diff --git a/trusty/debian/changelog b/trusty/debian/changelog
index 65f8a22191f9985c42f649e67741e247bad7a27d..cb8f4b91158f079379414fe04d54e247ebdc1694 100644 (file)
--- a/trusty/debian/changelog
+++ b/trusty/debian/changelog
@@ -1,6 +1,8 @@
 heat (2015.1~b1-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Reviewed (build-)depends for this release.
+  * Build the heat.conf.sample on the fly at build time.
 
  -- Thomas Goirand <zigo@debian.org>  Wed, 24 Dec 2014 17:45:14 +0800
 

diff --git a/trusty/debian/control b/trusty/debian/control
index 3fcd333d4915576929759b810e70682a78c51c25..22c6c91656e4a6b603d3d09b8acaad97fecdc874 100644 (file)
--- a/trusty/debian/control
+++ b/trusty/debian/control
@@ -7,6 +7,7 @@ Uploaders: Julien Danjou <acid@debian.org>,
            Mehdi Abaakouk <sileht@sileht.net>
 Build-Depends: debhelper (>= 9),
                dh-systemd,
+               dh-python,
                openstack-pkg-tools (>= 20~),
                po-debconf,
                python-all (>= 2.6.6-3~),
@@ -18,14 +19,14 @@ Build-Depends-Indep: python-babel (>= 1.3),
                      python-cliff (>= 1.6),
                      python-coverage (>= 3.6),
                      python-crypto,
-                     python-eventlet (>= 0.15.1),
-                     python-glanceclient (>= 1:0.14.0),
+                     python-eventlet (>= 0.15.2),
+                     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,
                      python-kombu (>= 2.5.0),
                      python-lockfile,
@@ -41,32 +42,34 @@ Build-Depends-Indep: python-babel (>= 1.3),
                      python-nosexcover,
                      python-novaclient (>= 2:2.18.0),
                      python-oslo.config (>= 1.4.0.0),
-                     python-oslo.db (>= 1.0.0),
+                     python-oslo.db (>= 1.1.0),
                      python-oslo.i18n (>= 1.0.0),
                      python-oslo.messaging (>= 1.4.1),
+                     python-oslo.middleware,
                      python-oslo.serialization,
-                     python-oslo.utils (>= 1.0.0),
+                     python-oslo.utils (>= 1.1.0),
                      python-oslosphinx (>= 2.2.0.0),
                      python-oslotest (>= 1.1.0.0),
+                     python-osprofiler,
                      python-paste,
                      python-pastedeploy,
                      python-posix-ipc,
                      python-psycopg2,
                      python-pycryptopp,
                      python-qpid,
-                     python-requests (>= 1.2.1),
+                     python-requests (>= 2.2.0),
                      python-routes,
-                     python-saharaclient (>= 0.7.3),
+                     python-saharaclient (>= 0.7.6),
                      python-sendfile,
                      python-setuptools,
                      python-six (>= 1.7.0),
-                     python-sqlalchemy (>= 0.7.8),
-                     python-stevedore (>= 1.0.0),
+                     python-sqlalchemy (>= 0.9.7),
+                     python-stevedore (>= 1.1.0),
                      python-subunit,
                      python-swiftclient (>= 1:2.2.0),
                      python-testscenarios (>= 0.4),
                      python-testtools (>= 0.9.34),
-                     python-troveclient (>= 1.0.4),
+                     python-troveclient (>= 1.0.7),
                      python-webob (>= 1.2.3),
                      python-yaml,
                      subunit (>= 0.0.18),
@@ -84,13 +87,13 @@ Depends: python-babel (>= 1.3),
          python-ceilometerclient (>= 1.0.6),
          python-cinderclient (>= 1:1.1.0),
          python-crypto,
-         python-eventlet (>= 0.15.1),
-         python-glanceclient (>= 1:0.14.0),
+         python-eventlet (>= 0.15.2),
+         python-glanceclient (>= 1:0.15.0),
          python-greenlet (>= 0.3.2),
          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,
          python-kombu (>= 2.5.0),
          python-lxml (>= 2.3),
@@ -101,27 +104,29 @@ Depends: python-babel (>= 1.3),
          python-neutronclient (>= 2.3.6),
          python-novaclient (>= 2:2.18.0),
          python-oslo.config (>= 1.4.0.0),
-         python-oslo.db (>= 1.0.0),
+         python-oslo.db (>= 1.1.0),
          python-oslo.i18n (>= 1.0.0),
          python-oslo.messaging (>= 1.4.1),
+         python-oslo.middleware,
          python-oslo.serialization,
-         python-oslo.utils (>= 1.0.0),
+         python-oslo.utils (>= 1.1.0),
+         python-osprofiler,
          python-paste,
          python-pastedeploy,
          python-pbr (>= 0.6),
          python-posix-ipc,
          python-pycryptopp,
          python-qpid,
-         python-requests (>= 1.2.1),
+         python-requests (>= 2.2.0),
          python-routes,
-         python-saharaclient (>= 0.7.3),
+         python-saharaclient (>= 0.7.6),
          python-sendfile,
          python-setuptools,
          python-six (>= 1.7.0),
-         python-sqlalchemy (>= 0.7.8),
-         python-stevedore (>= 1.0.0),
+         python-sqlalchemy (>= 0.9.7),
+         python-stevedore (>= 1.1.0),
          python-swiftclient (>= 1:2.2.0),
-         python-troveclient (>= 1.0.4),
+         python-troveclient (>= 1.0.7),
          python-webob (>= 1.2.3),
          python-yaml,
          ${misc:Depends},

diff --git a/trusty/debian/patches/fix-default-db.patch b/trusty/debian/patches/fix-default-db.patch
deleted file mode 100644 (file)
index 0884a13..0000000
--- a/trusty/debian/patches/fix-default-db.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: Set SQLite as default
- Set SQLite as default db backend
-Author: Thomas Goirand <zigo@debian.org>
-Forwarded: not-needed
-Last-Update: 2014-07-01
-
-Index: heat/etc/heat/heat.conf.sample
-===================================================================
---- heat.orig/etc/heat/heat.conf.sample        2014-10-02 19:01:45.000000000 +0800
-+++ heat/etc/heat/heat.conf.sample     2014-10-02 19:01:49.000000000 +0800
-@@ -866,7 +866,7 @@
- # Deprecated group/name - [DEFAULT]/sql_connection
- # Deprecated group/name - [DATABASE]/sql_connection
- # Deprecated group/name - [sql]/connection
--#connection=<None>
-+connection=sqlite:///var/lib/heat/heatdb
- 
- # The SQLAlchemy connection string to use to connect to the
- # slave database. (string value)

diff --git a/trusty/debian/patches/series b/trusty/debian/patches/series
index c67632a84e0cd09af5b28e63bbc91684d7281be8..014ce495f2cb59aa7abe6c15a22587dfe7b7cb9a 100644 (file)
--- a/trusty/debian/patches/series
+++ b/trusty/debian/patches/series
@@ -1,2 +1 @@
-fix-default-db.patch
 allow-routes-2.0.patch

diff --git a/trusty/debian/rules b/trusty/debian/rules
index 1f03b27d1387576c7564e08633acf1096622617f..95664574241defdd0331a6a674528ac514c3a56d 100755 (executable)
--- a/trusty/debian/rules
+++ b/trusty/debian/rules
@@ -33,6 +33,8 @@ override_dh_clean:
        rm -f debian/*.init debian/*.service debian/*.upstart
 
 override_dh_install:
+       PYTHONPATH=. bash tools/config/generate_sample.sh -b . -p heat -o etc/heat
+
        dh_install --fail-missing -Xbin/cinder-keystone-setup
        install -D -m 0640 etc/heat/heat.conf.sample $(CURDIR)/debian/heat-common/usr/share/heat-common/heat.conf
        sed -i 's|[# ]*auth_protocol[# ]*=.*|auth_protocol=http|' $(CURDIR)/debian/heat-common/usr/share/heat-common/heat.conf