Merge lp:~gandelman-a/ironic/rc1_packaging_fixes into lp:~ubuntu-server-dev/ironic/icehouse

[Adam Gandelman]

Various fixes to Ironic packaging for RC1

=== modified file 'debian/changelog'
--- debian/changelog	2014-03-06 18:23:38 +0000
+++ debian/changelog	2014-04-01 23:13:02 +0000
@@ -1,3 +1,18 @@
+ironic (2014.1~rc1-0ubuntu1) trusty; urgency=medium
+
+  * debian/ironic-common.postinst: Fix syntax preventing postinst
+    from running.
+  * debian/ironic-api.install: Create missing .install, install
+    ironic-api to /usr/bin/ironic-api.
+  * debian/patches/set_logdir.patch: Set log_dir to /var/log/ironic/ in
+    sample config, causing both daemons to log to respective files there.
+  * debian/{rules, ironic-common.install}: Install ironic.conf.sample
+    as /etc/ironic/ironic.conf.
+  * Fail build if test suite fails.
+  * debian/control: Add missing alembic, python-lockfile dependencies.
+
+ -- Adam Gandelman <[e-mail]>  Tue, 01 Apr 2014 12:55:01 -0700
+
 ironic (2014.1~b3-0ubuntu1) trusty; urgency=medium
 
   * New upstream release:

=== modified file 'debian/control'
--- debian/control	2014-03-06 18:05:27 +0000
+++ debian/control	2014-04-01 23:13:02 +0000
@@ -3,6 +3,7 @@
 Priority: extra
 Maintainer: Chuck Short <[e-mail]>
 Build-Depends: debhelper (>= 8.0.0),
+ alembic (>= 0.4.1),
  python-setuptools,
  python-all (>= 2.6),
  python-pbr (>= 0.5.21),
@@ -12,6 +13,7 @@
  python-eventlet (>= 0.13.0),
  python-kombu (>= 2.4.8),
  python-lxml (>= 2.3),
+ python-lockfile (>= 0.8),
  python-webob (>= 1.2.3),
  python-greenlet (>= 0.3.2),
  python-migrate,
@@ -43,12 +45,14 @@
 Package: python-ironic
 Architecture: all
 Depends: ${python:Depends}, ${misc:Depends},
+ alembic (>= 0.4.1),
  python-sqlalchemy (>= 0.7.8),
  python-amqplib (>= 0.3.3),
  python-anyjson,
  python-eventlet (>= 0.13.0),
  python-kombu (>= 2.4.8),
  python-lxml (>= 2.3),
+ python-lockfile (>= 0.8),
  python-webob (>= 1.2.3),
  python-greenlet (>= 0.3.2),
  python-migrate,

=== added file 'debian/ironic-api.install'
--- debian/ironic-api.install	1970-01-01 00:00:00 +0000
+++ debian/ironic-api.install	2014-04-01 23:13:02 +0000
@@ -0,0 +1,1 @@
+usr/bin/ironic-api

=== modified file 'debian/ironic-common.install'
--- debian/ironic-common.install	2014-01-17 14:23:29 +0000
+++ debian/ironic-common.install	2014-04-01 23:13:02 +0000
@@ -1,6 +1,8 @@
-usr/bin/ironic-dbsync
 debian/ironic_sudoers etc/sudoers.d
+etc/ironic/ironic.conf etc/ironic
 etc/ironic/policy.json etc/ironic
 etc/ironic/rootwrap.conf etc/ironic
+etc/ironic/rootwrap.d/ etc/ironic
+usr/bin/ironic-dbsync
 usr/bin/ironic-rootwrap
-etc/ironic/rootwrap.d/ etc/ironic
+

=== modified file 'debian/ironic-common.postinst'
--- debian/ironic-common.postinst	2014-01-07 21:56:48 +0000
+++ debian/ironic-common.postinst	2014-04-01 23:13:02 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh -e
 
-if [ "$1" = "configure"] ; then
+if [ "$1" = "configure" ] ; then
     if ! getent group ironic > /dev/null 2>&1; then
         addgroup --system ironic >/dev/null
     fi

=== added file 'debian/patches/series'
--- debian/patches/series	1970-01-01 00:00:00 +0000
+++ debian/patches/series	2014-04-01 23:13:02 +0000
@@ -0,0 +1,1 @@
+set_logdir.patch

=== added file 'debian/patches/set_logdir.patch'
--- debian/patches/set_logdir.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/set_logdir.patch	2014-04-01 23:13:02 +0000
@@ -0,0 +1,13 @@
+Index: ironic-2014.1.rc1/etc/ironic/ironic.conf.sample
+===================================================================
+--- ironic-2014.1.rc1.orig/etc/ironic/ironic.conf.sample	2014-04-01 12:49:34.000000000 -0700
++++ ironic-2014.1.rc1/etc/ironic/ironic.conf.sample	2014-04-01 15:52:31.594579356 -0700
+@@ -207,7 +207,7 @@
+ # (Optional) The base directory used for relative --log-file
+ # paths (string value)
+ # Deprecated group/name - [DEFAULT]/logdir
+-#log_dir=<None>
++log_dir=/var/log/ironic/
+ 
+ # Use syslog for logging. (boolean value)
+ #use_syslog=false

=== modified file 'debian/rules'
--- debian/rules	2014-01-07 21:56:48 +0000
+++ debian/rules	2014-04-01 23:13:02 +0000
@@ -7,8 +7,12 @@
 
 ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
 override_dh_auto_test:
-	testr init && testr run || true
+	testr init && testr run
 endif
 
+override_dh_install:
+	cp etc/ironic/ironic.conf.sample etc/ironic/ironic.conf
+	dh_install --fail-missing
+
 get-orig-source:
 	uscan --verbose --force-download --rename --destdir=../build-area