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

Proposed by Adam Gandelman on 2014-09-30
Status: Merged
Merged at revision: 17
Proposed branch: lp:~gandelman-a/ubuntu/utopic/ironic/juno
Merge into: lp:~ubuntu-server-dev/ironic/juno
Diff against target: 327 lines (+127/-81)
10 files modified
debian/changelog (+14/-0)
debian/control (+77/-60)
debian/copyright (+0/-1)
debian/ironic-common.install (+2/-1)
debian/ironic-common.postinst (+9/-5)
debian/ironic_sudoers (+1/-1)
debian/patches/series (+1/-1)
debian/patches/set_config_defaults.patch (+22/-0)
debian/patches/set_logdir.patch (+0/-12)
debian/pydist-overrides (+1/-0)
To merge this branch: bzr merge lp:~gandelman-a/ubuntu/utopic/ironic/juno
Reviewer Review Type Date Requested Status
James Page 2014-09-30 Needs Fixing on 2014-10-01
Review via email: mp+236635@code.launchpad.net

Description of the change

Refreshed Ironic packaging for Juno.

To post a comment you must log in.
James Page (james-page) :
review: Needs Fixing
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).

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
1ironic (2014.2~rc1-0ubuntu1) utopic; urgency=medium
2
3 * New upstream release.
4 * debian/patches/set_logdir.patch: Renamed to set_config_defaults.patch,
5 also set default sqlite db connection.
6 * debian/control: Refreshed dependencies for Juno, wrap-and-sort.
7 * debian/ironic-common.install: Added ironic-nova-bm-migrate binary.
8 * debian/ironic-common.postinst: Create the default sqlite database if
9 configured to use it and it does not exist.
10 * debian/pydist-overrides: Add pysendfile.
11 * debian/ironic_sudoers: Add rootwrap.conf (LP: #1185019).
12
13 -- Adam Gandelman <adamg@ubuntu.com> Tue, 30 Sep 2014 10:44:08 -0700
14
1ironic (2014.2~b1-0ubuntu1) utopic; urgency=medium15ironic (2014.2~b1-0ubuntu1) utopic; urgency=medium
216
3 * New upstream release.17 * New upstream release.
418
=== 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 @@
2Section: net2Section: net
3Priority: extra3Priority: extra
4Maintainer: Chuck Short <zulcss@ubuntu.com>4Maintainer: Chuck Short <zulcss@ubuntu.com>
5Build-Depends: debhelper (>= 8.0.0),5Build-Depends: alembic (>= 0.6.4),
6 alembic (>= 0.4.1),6 debhelper (>= 8.0.0),
7 python-setuptools,
8 python-all (>= 2.6),7 python-all (>= 2.6),
9 python-pbr (>= 0.5.21),
10 python-sqlalchemy (>= 0.7.8),
11 python-amqplib (>= 0.3.3),8 python-amqplib (>= 0.3.3),
12 python-anyjson,9 python-anyjson (>=0.3.3),
10 python-babel (>= 1.3),
13 python-eventlet (>= 0.13.0),11 python-eventlet (>= 0.13.0),
14 python-kombu (>= 2.4.8),
15 python-lxml (>= 2.3),
16 python-lockfile (>= 0.8),
17 python-webob (>= 1.2.3),
18 python-greenlet (>= 0.3.2),
19 python-migrate,
20 python-netaddr (>= 0.7.6),
21 python-paramiko (>= 1.8.0),
22 python-iso8601 (>= 0.1.8),
23 python-neutronclient (>= 2.3.0),
24 python-glanceclient (>= 0.9.0),
25 python-keystoneclient (>= 0.4.1),
26 python-stevedore (>= 0.12),
27 websockify,
28 python-oslo.config (>= 1.2.0),
29 python-oslo.rootwrap,
30 python-oslo.messaging,
31 python-pecan (>= 0.2.0),
32 python-six (>= 1.4.1),
33 python-sendfile,
34 python-jsonpatch (>= 1.1),
35 python-wsme (>= 0.5b6),
36 python-jinja2,
37 python-pyghmi,
38 python-fixtures (>= 0.3.14),12 python-fixtures (>= 0.3.14),
13 python-glanceclient (>= 0.14.0),
14 python-greenlet (>= 0.3.2),
15 python-iso8601 (>= 0.1.9),
16 python-jinja2,
17 python-jsonpatch (>= 1.1),
18 python-ironicclient,
19 python-keystoneclient (>= 0.10.0),
20 python-keystonemiddleware (>= 1.0.0),
21 python-kombu (>= 2.5.0),
22 python-lockfile (>= 0.8),
23 python-lxml (>= 2.3),
24 python-migrate (>= 0.9.1),
39 python-mock (>= 1.0),25 python-mock (>= 1.0),
40 python-babel (>= 1.3),
41 python-mysqldb,26 python-mysqldb,
27 python-netaddr (>= 0.7.12),
28 python-neutronclient (>= 2.3.6),
29 python-oslo.config (>= 1.4.0),
30 python-oslo.db (>= 1.0.0),
31 python-oslo.i18n (>= 1.0.0),
32 python-oslo.messaging (>= 1.4.0),
33 python-oslo.rootwrap (>= 1.3.0),
34 python-oslo.utils (>= 1.0.0),
35 python-oslotest (>= 1.1.0),
36 python-paramiko (>= 1.13.0),
37 python-pbr (>= 0.5.21),
38 python-pecan (>= 0.5.0),
39 python-posix-ipc,
40 python-pyghmi,
41 python-retrying (>= 1.2.2),
42 python-sendfile,
43 python-setuptools,
44 python-six (>= 1.7.0),
45 python-sqlalchemy (>= 0.7.8),
46 python-stevedore (>= 1.0.0),
42 python-subunit,47 python-subunit,
48 python-swiftclient (>= 2.2.0),
49 python-testtools (>= 0.9.34),
50 python-webob (>= 1.2.3),
51 python-wsme (>= 0.5b6),
43 testrepository (>= 0.0.17),52 testrepository (>= 0.0.17),
44 python-testtools (>= 0.9.32)53 websockify (>= 0.6.0)
45Standards-Version: 3.9.454Standards-Version: 3.9.4
46Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-server-dev/ironic/juno/files55Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-server-dev/ironic/juno/files
47Vcs-Bzr: https://code.launchpad.net/~ubuntu-server-dev/ironic/juno56Vcs-Bzr: https://code.launchpad.net/~ubuntu-server-dev/ironic/juno
4857
49Package: python-ironic58Package: python-ironic
50Architecture: all59Architecture: all
51Depends: ${python:Depends}, ${misc:Depends},60Depends: alembic (>= 0.6.4),
52 alembic (>= 0.4.1),
53 python-sqlalchemy (>= 0.7.8),
54 python-amqplib (>= 0.3.3),61 python-amqplib (>= 0.3.3),
55 python-anyjson,62 python-anyjson (>= 0.3.3),
63 python-babel,
56 python-eventlet (>= 0.13.0),64 python-eventlet (>= 0.13.0),
65 python-glanceclient (>= 0.14.0),
66 python-greenlet (>= 0.3.2),
67 python-iso8601 (>= 0.1.9),
68 python-jinja2,
69 python-jsonpatch (>= 1.1),
70 python-keystoneclient (>= 0.10.0),
71 python-keystonemiddleware (>= 1.0.0),
57 python-kombu (>= 2.4.8),72 python-kombu (>= 2.4.8),
73 python-lockfile (>= 0.8),
58 python-lxml (>= 2.3),74 python-lxml (>= 2.3),
59 python-lockfile (>= 0.8),75 python-migrate (> 0.9.1),
76 python-netaddr (>= 0.7.12),
77 python-neutronclient (>= 2.3.6),
78 python-oslo.config (>= 1.4.0),
79 python-oslo.db (>= 1.0.0),
80 python-oslo.i18n (>= 1.0.0),
81 python-oslo.messaging (>= 1.4.0),
82 python-oslo.rootwrap (>= 1.3.0),
83 python-oslo.utils (>= 1.0.0),
84 python-paramiko (>= 1.13.0),
85 python-pecan (>= 0.5.0),
86 python-pyghmi,
87 python-retrying (>= 1.2.2),
88 python-six (>= 1.7.0),
89 python-sqlalchemy (>= 0.7.8),
90 python-stevedore (>= 1.0.0),
91 python-swiftclient (>= 2.2.0),
60 python-webob (>= 1.2.3),92 python-webob (>= 1.2.3),
61 python-greenlet (>= 0.3.2),
62 python-migrate,
63 python-netaddr (>= 0.7.6),
64 python-paramiko (>= 1.8.0),
65 python-iso8601 (>= 0.1.8),
66 python-neutronclient (>= 2.3.0),
67 python-glanceclient (>= 0.9.0),
68 python-keystoneclient (>= 0.4.1),
69 python-stevedore (>= 0.12),
70 websockify,
71 python-oslo.config (>= 1.2.0),
72 python-pecan (>= 0.2.0),
73 python-six (>= 1.4.1),
74 python-jsonpatch (>= 1.1),
75 python-wsme (>= 0.5b6),93 python-wsme (>= 0.5b6),
76 python-jinja2,94 websockify (>= 0.6.0),
77 python-pyghmi,95 ${misc:Depends},
78 python-babel96 ${python:Depends}
79Description: Openstack bare metal provisioning service - Python library97Description: Openstack bare metal provisioning service - Python library
80 Ironic is an Incubated OpenStack project which aims to provision98 Ironic is an Incubated OpenStack project which aims to provision
81 bare metal machines instead of virtual machines, forked from the99 bare metal machines instead of virtual machines, forked from the
@@ -90,9 +108,10 @@
90108
91Package: ironic-common109Package: ironic-common
92Architecture: all110Architecture: all
93Depends: ${python:Depends}, ${misc:Depends},111Depends: adduser,
94 python-ironic (= ${source:Version}),112 python-ironic (= ${source:Version}),
95 adduser113 ${misc:Depends},
114 ${python:Depends}
96Description: Openstack bare metal provisioning service - daemons115Description: Openstack bare metal provisioning service - daemons
97 Ironic is an Incubated OpenStack project which aims to provision116 Ironic is an Incubated OpenStack project which aims to provision
98 bare metal machines instead of virtual machines, forked from the117 bare metal machines instead of virtual machines, forked from the
@@ -107,8 +126,7 @@
107126
108Package: ironic-api127Package: ironic-api
109Architecture: all128Architecture: all
110Depends: ironic-common (= ${binary:Version}),129Depends: ironic-common (= ${binary:Version}), ${misc:Depends}, ${python:Depends}
111 ${misc:Depends}, ${python:Depends}
112Description: Openstack bare metal provisioning service - API130Description: Openstack bare metal provisioning service - API
113 Ironic is an Incubated OpenStack project which aims to provision131 Ironic is an Incubated OpenStack project which aims to provision
114 bare metal machines instead of virtual machines, forked from the132 bare metal machines instead of virtual machines, forked from the
@@ -123,8 +141,7 @@
123141
124Package: ironic-conductor142Package: ironic-conductor
125Architecture: all143Architecture: all
126Depends: ironic-common (= ${binary:Version}),144Depends: ironic-common (= ${binary:Version}), ${misc:Depends}, ${python:Depends}
127 ${misc:Depends}, ${python:Depends}
128Description: Openstack bare metal provisioning service - conductor145Description: Openstack bare metal provisioning service - conductor
129 Ironic is an Incubated OpenStack project which aims to provision146 Ironic is an Incubated OpenStack project which aims to provision
130 bare metal machines instead of virtual machines, forked from the147 bare metal machines instead of virtual machines, forked from the
131148
=== 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 @@
38 .38 .
39 On Debian-based systems the full text of the Apache version 2.0 license39 On Debian-based systems the full text of the Apache version 2.0 license
40 can be found in `/usr/share/common-licenses/Apache-2.0'.40 can be found in `/usr/share/common-licenses/Apache-2.0'.
41
4241
=== 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 @@
1
1debian/ironic_sudoers etc/sudoers.d2debian/ironic_sudoers etc/sudoers.d
2etc/ironic/ironic.conf etc/ironic3etc/ironic/ironic.conf etc/ironic
3etc/ironic/policy.json etc/ironic4etc/ironic/policy.json etc/ironic
@@ -5,4 +6,4 @@
5etc/ironic/rootwrap.d/ etc/ironic6etc/ironic/rootwrap.d/ etc/ironic
6usr/bin/ironic-dbsync7usr/bin/ironic-dbsync
7usr/bin/ironic-rootwrap8usr/bin/ironic-rootwrap
89usr/bin/ironic-nova-bm-migrate
910
=== 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 @@
9 adduser --system --home /var/lib/ironic --ingroup ironic --no-create-home --shell /bin/false ironic9 adduser --system --home /var/lib/ironic --ingroup ironic --no-create-home --shell /bin/false ironic
10 fi10 fi
1111
12 chown -R ironic:adm /var/log/ironic12 chown -R ironic:adm /var/log/ironic
13 chmod 0750 /var/log/ironic13 chmod 0750 /var/log/ironic
14 mkdir -p /etc/ironic14 mkdir -p /etc/ironic
15 mkdir -p /var/lib/ironic15 mkdir -p /var/lib/ironic
16 chown ironic:ironic -R /var/lib/ironic /etc/ironic16 default_db=/var/lib/ironic/ironic.db
17 if grep -q "^connection=sqlite:///$default_db" /etc/ironic/ironic.conf && [ ! -e /var/lib/ironic/ironic.db ]; then
18 ironic-dbsync create_schema
19 fi
20 chown ironic:ironic -R /var/lib/ironic /etc/ironic
17fi21fi
1822
19#DEBHELPER#23#DEBHELPER#
2024
=== 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 @@
1Defaults:ironic !requiretty1Defaults:ironic !requiretty
22
3ironic ALL = (root) NOPASSWD: /usr/bin/ironic-rootwrap3ironic ALL = (root) NOPASSWD: /usr/bin/ironic-rootwrap /etc/ironic/rootwrap.conf *
44
=== 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 @@
1set_logdir.patch1set_config_defaults.patch
22
=== 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 @@
1diff --git a/etc/ironic/ironic.conf.sample b/etc/ironic/ironic.conf.sample
2index 9ed172e..05769c8 100644
3--- a/etc/ironic/ironic.conf.sample
4+++ b/etc/ironic/ironic.conf.sample
5@@ -431,7 +431,7 @@
6 # (Optional) The base directory used for relative --log-file
7 # paths. (string value)
8 # Deprecated group/name - [DEFAULT]/logdir
9-#log_dir=<None>
10+log_dir=/var/log/ironic
11
12 # Use syslog for logging. Existing syslog format is DEPRECATED
13 # during I, and will change in J to honor RFC5424. (boolean
14@@ -621,7 +621,7 @@
15 # Deprecated group/name - [DEFAULT]/sql_connection
16 # Deprecated group/name - [DATABASE]/sql_connection
17 # Deprecated group/name - [sql]/connection
18-#connection=<None>
19+connection=sqlite:////var/lib/ironic/ironic.db
20
21 # The SQLAlchemy connection string to use to connect to the
22 # slave database. (string value)
023
=== 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 @@
1diff -Naurp ironic-2014.2.b1.orig/etc/ironic/ironic.conf.sample ironic-2014.2.b1/etc/ironic/ironic.conf.sample
2--- ironic-2014.2.b1.orig/etc/ironic/ironic.conf.sample 2014-06-12 11:53:47.000000000 -0400
3+++ ironic-2014.2.b1/etc/ironic/ironic.conf.sample 2014-07-07 08:07:05.710927000 -0400
4@@ -425,7 +425,7 @@
5 # (Optional) The base directory used for relative --log-file
6 # paths (string value)
7 # Deprecated group/name - [DEFAULT]/logdir
8-#log_dir=<None>
9+log_dir=/var/log/ironic
10
11 # Use syslog for logging. Existing syslog format is DEPRECATED
12 # during I, and then will be changed in J to honor RFC5424
130
=== 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 @@
1argparse1argparse
2pysendfile

Subscribers

People subscribed via source and target branches