Merge lp:~gandelman-a/ubuntu/utopic/ironic/juno into lp:~ubuntu-server-dev/ironic/juno

[Adam Gandelman]

Refreshed Ironic packaging for Juno.

[James Page (james-page)]

review: Needs Fixing

[lp:~gandelman-a/ubuntu/utopic/ironic/juno]

18. By Adam Gandelman on 2014-10-02

Checkin set_config_defaults.patch

19. By Adam Gandelman on 2014-10-03

debian/ironic_sudoers: Add rootwrap.conf (LP: #1185019).

=== modified file 'debian/changelog'
--- debian/changelog	2014-07-07 12:29:16 +0000
+++ debian/changelog	2014-10-03 22:31:55 +0000
@@ -1,3 +1,17 @@
+ironic (2014.2~rc1-0ubuntu1) utopic; urgency=medium
+
+  * New upstream release.
+  * debian/patches/set_logdir.patch: Renamed to set_config_defaults.patch,
+    also set default sqlite db connection.
+  * debian/control: Refreshed dependencies for Juno, wrap-and-sort.
+  * debian/ironic-common.install: Added ironic-nova-bm-migrate binary.
+  * debian/ironic-common.postinst: Create the default sqlite database if
+    configured to use it and it does not exist.
+  * debian/pydist-overrides: Add pysendfile.
+  * debian/ironic_sudoers: Add rootwrap.conf (LP: #1185019).
+
+ -- Adam Gandelman <[e-mail]>  Tue, 30 Sep 2014 10:44:08 -0700
+
 ironic (2014.2~b1-0ubuntu1) utopic; urgency=medium
 
   * New upstream release.

=== modified file 'debian/control'
--- debian/control	2014-07-07 12:29:16 +0000
+++ debian/control	2014-10-03 22:31:55 +0000
@@ -2,80 +2,98 @@
 Section: net
 Priority: extra
 Maintainer: Chuck Short <[e-mail]>
-Build-Depends: debhelper (>= 8.0.0),
- alembic (>= 0.4.1),
- python-setuptools,
+Build-Depends: alembic (>= 0.6.4),
+ debhelper (>= 8.0.0),
  python-all (>= 2.6),
- python-pbr (>= 0.5.21),
- python-sqlalchemy (>= 0.7.8),
  python-amqplib (>= 0.3.3),
- python-anyjson,
+ python-anyjson (>=0.3.3),
+ python-babel (>= 1.3),
  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,
- python-netaddr (>= 0.7.6),
- python-paramiko (>= 1.8.0),
- python-iso8601 (>= 0.1.8),
- python-neutronclient (>= 2.3.0),
- python-glanceclient (>= 0.9.0),
- python-keystoneclient (>= 0.4.1),
- python-stevedore (>= 0.12),
- websockify,
- python-oslo.config (>= 1.2.0),
- python-oslo.rootwrap,
- python-oslo.messaging,
- python-pecan (>= 0.2.0),
- python-six (>= 1.4.1),
- python-sendfile,
- python-jsonpatch (>= 1.1),
- python-wsme (>= 0.5b6),
- python-jinja2,
- python-pyghmi,
  python-fixtures (>= 0.3.14),
+ python-glanceclient (>= 0.14.0),
+ python-greenlet (>= 0.3.2),
+ python-iso8601 (>= 0.1.9),
+ python-jinja2,
+ python-jsonpatch (>= 1.1),
+ python-ironicclient,
+ python-keystoneclient (>= 0.10.0),
+ python-keystonemiddleware (>= 1.0.0),
+ python-kombu (>= 2.5.0),
+ python-lockfile (>= 0.8),
+ python-lxml (>= 2.3),
+ python-migrate (>= 0.9.1),
  python-mock (>= 1.0),
- python-babel (>= 1.3),
  python-mysqldb,
+ python-netaddr (>= 0.7.12),
+ python-neutronclient (>= 2.3.6),
+ python-oslo.config (>= 1.4.0),
+ python-oslo.db (>= 1.0.0),
+ python-oslo.i18n (>= 1.0.0),
+ python-oslo.messaging (>= 1.4.0),
+ python-oslo.rootwrap (>= 1.3.0),
+ python-oslo.utils (>= 1.0.0),
+ python-oslotest (>= 1.1.0),
+ python-paramiko (>= 1.13.0),
+ python-pbr (>= 0.5.21),
+ python-pecan (>= 0.5.0),
+ python-posix-ipc,
+ python-pyghmi,
+ python-retrying (>= 1.2.2),
+ python-sendfile,
+ python-setuptools,
+ python-six (>= 1.7.0),
+ python-sqlalchemy (>= 0.7.8),
+ python-stevedore (>= 1.0.0),
  python-subunit,
+ python-swiftclient (>= 2.2.0),
+ python-testtools (>= 0.9.34),
+ python-webob (>= 1.2.3),
+ python-wsme (>= 0.5b6),
  testrepository (>= 0.0.17),
- python-testtools (>= 0.9.32)
+ websockify (>= 0.6.0)
 Standards-Version: 3.9.4
 Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-server-dev/ironic/juno/files
 Vcs-Bzr: https://code.launchpad.net/~ubuntu-server-dev/ironic/juno
 
 Package: python-ironic
 Architecture: all
-Depends: ${python:Depends}, ${misc:Depends},
- alembic (>= 0.4.1),
- python-sqlalchemy (>= 0.7.8),
+Depends: alembic (>= 0.6.4),
  python-amqplib (>= 0.3.3),
- python-anyjson,
+ python-anyjson (>= 0.3.3),
+ python-babel,
  python-eventlet (>= 0.13.0),
+ python-glanceclient (>= 0.14.0),
+ python-greenlet (>= 0.3.2),
+ python-iso8601 (>= 0.1.9),
+ python-jinja2,
+ python-jsonpatch (>= 1.1),
+ python-keystoneclient (>= 0.10.0),
+ python-keystonemiddleware (>= 1.0.0),
  python-kombu (>= 2.4.8),
+ python-lockfile (>= 0.8),
  python-lxml (>= 2.3),
- python-lockfile (>= 0.8),
+ python-migrate (> 0.9.1),
+ python-netaddr (>= 0.7.12),
+ python-neutronclient (>= 2.3.6),
+ python-oslo.config (>= 1.4.0),
+ python-oslo.db (>= 1.0.0),
+ python-oslo.i18n (>= 1.0.0),
+ python-oslo.messaging (>= 1.4.0),
+ python-oslo.rootwrap (>= 1.3.0),
+ python-oslo.utils (>= 1.0.0),
+ python-paramiko (>= 1.13.0),
+ python-pecan (>= 0.5.0),
+ python-pyghmi,
+ python-retrying (>= 1.2.2),
+ python-six (>= 1.7.0),
+ python-sqlalchemy (>= 0.7.8),
+ python-stevedore (>= 1.0.0),
+ python-swiftclient (>= 2.2.0),
  python-webob (>= 1.2.3),
- python-greenlet (>= 0.3.2),
- python-migrate,
- python-netaddr (>= 0.7.6),
- python-paramiko (>= 1.8.0),
- python-iso8601 (>= 0.1.8),
- python-neutronclient (>= 2.3.0),
- python-glanceclient (>= 0.9.0),
- python-keystoneclient (>= 0.4.1),
- python-stevedore (>= 0.12),
- websockify,
- python-oslo.config (>= 1.2.0),
- python-pecan (>= 0.2.0),
- python-six (>= 1.4.1),
- python-jsonpatch (>= 1.1),
  python-wsme (>= 0.5b6),
- python-jinja2,
- python-pyghmi,
- python-babel
+ websockify (>= 0.6.0),
+ ${misc:Depends},
+ ${python:Depends}
 Description: Openstack bare metal provisioning service - Python library
  Ironic is an Incubated OpenStack project which aims to provision
  bare metal machines instead of virtual machines, forked from the
@@ -90,9 +108,10 @@
 
 Package: ironic-common
 Architecture: all
-Depends: ${python:Depends}, ${misc:Depends},
+Depends: adduser,
  python-ironic (= ${source:Version}),
- adduser
+ ${misc:Depends},
+ ${python:Depends}
 Description: Openstack bare metal provisioning service - daemons
  Ironic is an Incubated OpenStack project which aims to provision
  bare metal machines instead of virtual machines, forked from the
@@ -107,8 +126,7 @@
 
 Package: ironic-api
 Architecture: all
-Depends: ironic-common (= ${binary:Version}),
- ${misc:Depends}, ${python:Depends}
+Depends: ironic-common (= ${binary:Version}), ${misc:Depends}, ${python:Depends}
 Description: Openstack bare metal provisioning service - API
  Ironic is an Incubated OpenStack project which aims to provision
  bare metal machines instead of virtual machines, forked from the
@@ -123,8 +141,7 @@
 
 Package: ironic-conductor
 Architecture: all
-Depends: ironic-common (= ${binary:Version}),
- ${misc:Depends}, ${python:Depends}
+Depends: ironic-common (= ${binary:Version}), ${misc:Depends}, ${python:Depends}
 Description: Openstack bare metal provisioning service - conductor
  Ironic is an Incubated OpenStack project which aims to provision
  bare metal machines instead of virtual machines, forked from the

=== modified file 'debian/copyright'
--- debian/copyright	2014-01-07 21:56:48 +0000
+++ debian/copyright	2014-10-03 22:31:55 +0000
@@ -38,4 +38,3 @@
  .
  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'.
-

=== modified file 'debian/ironic-common.install'
--- debian/ironic-common.install	2014-04-01 20:00:07 +0000
+++ debian/ironic-common.install	2014-10-03 22:31:55 +0000
@@ -1,3 +1,4 @@
+
 debian/ironic_sudoers etc/sudoers.d
 etc/ironic/ironic.conf etc/ironic
 etc/ironic/policy.json etc/ironic
@@ -5,4 +6,4 @@
 etc/ironic/rootwrap.d/ etc/ironic
 usr/bin/ironic-dbsync
 usr/bin/ironic-rootwrap
-
+usr/bin/ironic-nova-bm-migrate

=== modified file 'debian/ironic-common.postinst'
--- debian/ironic-common.postinst	2014-04-01 19:55:47 +0000
+++ debian/ironic-common.postinst	2014-10-03 22:31:55 +0000
@@ -9,11 +9,15 @@
         adduser --system --home /var/lib/ironic --ingroup ironic --no-create-home --shell /bin/false ironic
     fi
 
-        chown -R ironic:adm /var/log/ironic
-        chmod 0750 /var/log/ironic
-        mkdir -p /etc/ironic
-        mkdir -p /var/lib/ironic
-        chown ironic:ironic -R /var/lib/ironic /etc/ironic
+    chown -R ironic:adm /var/log/ironic
+    chmod 0750 /var/log/ironic
+    mkdir -p /etc/ironic
+    mkdir -p /var/lib/ironic
+    default_db=/var/lib/ironic/ironic.db
+    if grep -q "^connection=sqlite:///$default_db" /etc/ironic/ironic.conf && [ ! -e /var/lib/ironic/ironic.db ]; then
+        ironic-dbsync create_schema
+    fi
+    chown ironic:ironic -R /var/lib/ironic /etc/ironic
 fi
 
 #DEBHELPER#

=== modified file 'debian/ironic_sudoers'
--- debian/ironic_sudoers	2014-01-07 21:56:48 +0000
+++ debian/ironic_sudoers	2014-10-03 22:31:55 +0000
@@ -1,3 +1,3 @@
 Defaults:ironic !requiretty
 
-ironic ALL = (root) NOPASSWD: /usr/bin/ironic-rootwrap
+ironic ALL = (root) NOPASSWD: /usr/bin/ironic-rootwrap /etc/ironic/rootwrap.conf *

=== modified file 'debian/patches/series'
--- debian/patches/series	2014-04-01 22:53:05 +0000
+++ debian/patches/series	2014-10-03 22:31:55 +0000
@@ -1,1 +1,1 @@
-set_logdir.patch
+set_config_defaults.patch

=== added file 'debian/patches/set_config_defaults.patch'
--- debian/patches/set_config_defaults.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/set_config_defaults.patch	2014-10-03 22:31:55 +0000
@@ -0,0 +1,22 @@
+diff --git a/etc/ironic/ironic.conf.sample b/etc/ironic/ironic.conf.sample
+index 9ed172e..05769c8 100644
+--- a/etc/ironic/ironic.conf.sample
++++ b/etc/ironic/ironic.conf.sample
+@@ -431,7 +431,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. Existing syslog format is DEPRECATED
+ # during I, and will change in J to honor RFC5424. (boolean
+@@ -621,7 +621,7 @@
+ # Deprecated group/name - [DEFAULT]/sql_connection
+ # Deprecated group/name - [DATABASE]/sql_connection
+ # Deprecated group/name - [sql]/connection
+-#connection=<None>
++connection=sqlite:////var/lib/ironic/ironic.db
+ 
+ # The SQLAlchemy connection string to use to connect to the
+ # slave database. (string value)

=== removed file 'debian/patches/set_logdir.patch'
--- debian/patches/set_logdir.patch	2014-07-07 12:29:16 +0000
+++ debian/patches/set_logdir.patch	1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-diff -Naurp ironic-2014.2.b1.orig/etc/ironic/ironic.conf.sample ironic-2014.2.b1/etc/ironic/ironic.conf.sample
---- ironic-2014.2.b1.orig/etc/ironic/ironic.conf.sample	2014-06-12 11:53:47.000000000 -0400
-+++ ironic-2014.2.b1/etc/ironic/ironic.conf.sample	2014-07-07 08:07:05.710927000 -0400
-@@ -425,7 +425,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. Existing syslog format is DEPRECATED
- # during I, and then will be changed in J to honor RFC5424

=== modified file 'debian/pydist-overrides'
--- debian/pydist-overrides	2014-01-07 21:56:48 +0000
+++ debian/pydist-overrides	2014-10-03 22:31:55 +0000
@@ -1,1 +1,2 @@
 argparse
+pysendfile