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
1=== modified file 'debian/changelog'
2--- debian/changelog 2014-07-07 12:29:16 +0000
3+++ debian/changelog 2014-10-03 22:31:55 +0000
4@@ -1,3 +1,17 @@
5+ironic (2014.2~rc1-0ubuntu1) utopic; urgency=medium
6+
7+ * New upstream release.
8+ * debian/patches/set_logdir.patch: Renamed to set_config_defaults.patch,
9+ also set default sqlite db connection.
10+ * debian/control: Refreshed dependencies for Juno, wrap-and-sort.
11+ * debian/ironic-common.install: Added ironic-nova-bm-migrate binary.
12+ * debian/ironic-common.postinst: Create the default sqlite database if
13+ configured to use it and it does not exist.
14+ * debian/pydist-overrides: Add pysendfile.
15+ * debian/ironic_sudoers: Add rootwrap.conf (LP: #1185019).
16+
17+ -- Adam Gandelman <adamg@ubuntu.com> Tue, 30 Sep 2014 10:44:08 -0700
18+
19 ironic (2014.2~b1-0ubuntu1) utopic; urgency=medium
20
21 * New upstream release.
22
23=== modified file 'debian/control'
24--- debian/control 2014-07-07 12:29:16 +0000
25+++ debian/control 2014-10-03 22:31:55 +0000
26@@ -2,80 +2,98 @@
27 Section: net
28 Priority: extra
29 Maintainer: Chuck Short <zulcss@ubuntu.com>
30-Build-Depends: debhelper (>= 8.0.0),
31- alembic (>= 0.4.1),
32- python-setuptools,
33+Build-Depends: alembic (>= 0.6.4),
34+ debhelper (>= 8.0.0),
35 python-all (>= 2.6),
36- python-pbr (>= 0.5.21),
37- python-sqlalchemy (>= 0.7.8),
38 python-amqplib (>= 0.3.3),
39- python-anyjson,
40+ python-anyjson (>=0.3.3),
41+ python-babel (>= 1.3),
42 python-eventlet (>= 0.13.0),
43- python-kombu (>= 2.4.8),
44- python-lxml (>= 2.3),
45- python-lockfile (>= 0.8),
46- python-webob (>= 1.2.3),
47- python-greenlet (>= 0.3.2),
48- python-migrate,
49- python-netaddr (>= 0.7.6),
50- python-paramiko (>= 1.8.0),
51- python-iso8601 (>= 0.1.8),
52- python-neutronclient (>= 2.3.0),
53- python-glanceclient (>= 0.9.0),
54- python-keystoneclient (>= 0.4.1),
55- python-stevedore (>= 0.12),
56- websockify,
57- python-oslo.config (>= 1.2.0),
58- python-oslo.rootwrap,
59- python-oslo.messaging,
60- python-pecan (>= 0.2.0),
61- python-six (>= 1.4.1),
62- python-sendfile,
63- python-jsonpatch (>= 1.1),
64- python-wsme (>= 0.5b6),
65- python-jinja2,
66- python-pyghmi,
67 python-fixtures (>= 0.3.14),
68+ python-glanceclient (>= 0.14.0),
69+ python-greenlet (>= 0.3.2),
70+ python-iso8601 (>= 0.1.9),
71+ python-jinja2,
72+ python-jsonpatch (>= 1.1),
73+ python-ironicclient,
74+ python-keystoneclient (>= 0.10.0),
75+ python-keystonemiddleware (>= 1.0.0),
76+ python-kombu (>= 2.5.0),
77+ python-lockfile (>= 0.8),
78+ python-lxml (>= 2.3),
79+ python-migrate (>= 0.9.1),
80 python-mock (>= 1.0),
81- python-babel (>= 1.3),
82 python-mysqldb,
83+ python-netaddr (>= 0.7.12),
84+ python-neutronclient (>= 2.3.6),
85+ python-oslo.config (>= 1.4.0),
86+ python-oslo.db (>= 1.0.0),
87+ python-oslo.i18n (>= 1.0.0),
88+ python-oslo.messaging (>= 1.4.0),
89+ python-oslo.rootwrap (>= 1.3.0),
90+ python-oslo.utils (>= 1.0.0),
91+ python-oslotest (>= 1.1.0),
92+ python-paramiko (>= 1.13.0),
93+ python-pbr (>= 0.5.21),
94+ python-pecan (>= 0.5.0),
95+ python-posix-ipc,
96+ python-pyghmi,
97+ python-retrying (>= 1.2.2),
98+ python-sendfile,
99+ python-setuptools,
100+ python-six (>= 1.7.0),
101+ python-sqlalchemy (>= 0.7.8),
102+ python-stevedore (>= 1.0.0),
103 python-subunit,
104+ python-swiftclient (>= 2.2.0),
105+ python-testtools (>= 0.9.34),
106+ python-webob (>= 1.2.3),
107+ python-wsme (>= 0.5b6),
108 testrepository (>= 0.0.17),
109- python-testtools (>= 0.9.32)
110+ websockify (>= 0.6.0)
111 Standards-Version: 3.9.4
112 Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-server-dev/ironic/juno/files
113 Vcs-Bzr: https://code.launchpad.net/~ubuntu-server-dev/ironic/juno
114
115 Package: python-ironic
116 Architecture: all
117-Depends: ${python:Depends}, ${misc:Depends},
118- alembic (>= 0.4.1),
119- python-sqlalchemy (>= 0.7.8),
120+Depends: alembic (>= 0.6.4),
121 python-amqplib (>= 0.3.3),
122- python-anyjson,
123+ python-anyjson (>= 0.3.3),
124+ python-babel,
125 python-eventlet (>= 0.13.0),
126+ python-glanceclient (>= 0.14.0),
127+ python-greenlet (>= 0.3.2),
128+ python-iso8601 (>= 0.1.9),
129+ python-jinja2,
130+ python-jsonpatch (>= 1.1),
131+ python-keystoneclient (>= 0.10.0),
132+ python-keystonemiddleware (>= 1.0.0),
133 python-kombu (>= 2.4.8),
134+ python-lockfile (>= 0.8),
135 python-lxml (>= 2.3),
136- python-lockfile (>= 0.8),
137+ python-migrate (> 0.9.1),
138+ python-netaddr (>= 0.7.12),
139+ python-neutronclient (>= 2.3.6),
140+ python-oslo.config (>= 1.4.0),
141+ python-oslo.db (>= 1.0.0),
142+ python-oslo.i18n (>= 1.0.0),
143+ python-oslo.messaging (>= 1.4.0),
144+ python-oslo.rootwrap (>= 1.3.0),
145+ python-oslo.utils (>= 1.0.0),
146+ python-paramiko (>= 1.13.0),
147+ python-pecan (>= 0.5.0),
148+ python-pyghmi,
149+ python-retrying (>= 1.2.2),
150+ python-six (>= 1.7.0),
151+ python-sqlalchemy (>= 0.7.8),
152+ python-stevedore (>= 1.0.0),
153+ python-swiftclient (>= 2.2.0),
154 python-webob (>= 1.2.3),
155- python-greenlet (>= 0.3.2),
156- python-migrate,
157- python-netaddr (>= 0.7.6),
158- python-paramiko (>= 1.8.0),
159- python-iso8601 (>= 0.1.8),
160- python-neutronclient (>= 2.3.0),
161- python-glanceclient (>= 0.9.0),
162- python-keystoneclient (>= 0.4.1),
163- python-stevedore (>= 0.12),
164- websockify,
165- python-oslo.config (>= 1.2.0),
166- python-pecan (>= 0.2.0),
167- python-six (>= 1.4.1),
168- python-jsonpatch (>= 1.1),
169 python-wsme (>= 0.5b6),
170- python-jinja2,
171- python-pyghmi,
172- python-babel
173+ websockify (>= 0.6.0),
174+ ${misc:Depends},
175+ ${python:Depends}
176 Description: Openstack bare metal provisioning service - Python library
177 Ironic is an Incubated OpenStack project which aims to provision
178 bare metal machines instead of virtual machines, forked from the
179@@ -90,9 +108,10 @@
180
181 Package: ironic-common
182 Architecture: all
183-Depends: ${python:Depends}, ${misc:Depends},
184+Depends: adduser,
185 python-ironic (= ${source:Version}),
186- adduser
187+ ${misc:Depends},
188+ ${python:Depends}
189 Description: Openstack bare metal provisioning service - daemons
190 Ironic is an Incubated OpenStack project which aims to provision
191 bare metal machines instead of virtual machines, forked from the
192@@ -107,8 +126,7 @@
193
194 Package: ironic-api
195 Architecture: all
196-Depends: ironic-common (= ${binary:Version}),
197- ${misc:Depends}, ${python:Depends}
198+Depends: ironic-common (= ${binary:Version}), ${misc:Depends}, ${python:Depends}
199 Description: Openstack bare metal provisioning service - API
200 Ironic is an Incubated OpenStack project which aims to provision
201 bare metal machines instead of virtual machines, forked from the
202@@ -123,8 +141,7 @@
203
204 Package: ironic-conductor
205 Architecture: all
206-Depends: ironic-common (= ${binary:Version}),
207- ${misc:Depends}, ${python:Depends}
208+Depends: ironic-common (= ${binary:Version}), ${misc:Depends}, ${python:Depends}
209 Description: Openstack bare metal provisioning service - conductor
210 Ironic is an Incubated OpenStack project which aims to provision
211 bare metal machines instead of virtual machines, forked from the
212
213=== modified file 'debian/copyright'
214--- debian/copyright 2014-01-07 21:56:48 +0000
215+++ debian/copyright 2014-10-03 22:31:55 +0000
216@@ -38,4 +38,3 @@
217 .
218 On Debian-based systems the full text of the Apache version 2.0 license
219 can be found in `/usr/share/common-licenses/Apache-2.0'.
220-
221
222=== modified file 'debian/ironic-common.install'
223--- debian/ironic-common.install 2014-04-01 20:00:07 +0000
224+++ debian/ironic-common.install 2014-10-03 22:31:55 +0000
225@@ -1,3 +1,4 @@
226+
227 debian/ironic_sudoers etc/sudoers.d
228 etc/ironic/ironic.conf etc/ironic
229 etc/ironic/policy.json etc/ironic
230@@ -5,4 +6,4 @@
231 etc/ironic/rootwrap.d/ etc/ironic
232 usr/bin/ironic-dbsync
233 usr/bin/ironic-rootwrap
234-
235+usr/bin/ironic-nova-bm-migrate
236
237=== modified file 'debian/ironic-common.postinst'
238--- debian/ironic-common.postinst 2014-04-01 19:55:47 +0000
239+++ debian/ironic-common.postinst 2014-10-03 22:31:55 +0000
240@@ -9,11 +9,15 @@
241 adduser --system --home /var/lib/ironic --ingroup ironic --no-create-home --shell /bin/false ironic
242 fi
243
244- chown -R ironic:adm /var/log/ironic
245- chmod 0750 /var/log/ironic
246- mkdir -p /etc/ironic
247- mkdir -p /var/lib/ironic
248- chown ironic:ironic -R /var/lib/ironic /etc/ironic
249+ chown -R ironic:adm /var/log/ironic
250+ chmod 0750 /var/log/ironic
251+ mkdir -p /etc/ironic
252+ mkdir -p /var/lib/ironic
253+ default_db=/var/lib/ironic/ironic.db
254+ if grep -q "^connection=sqlite:///$default_db" /etc/ironic/ironic.conf && [ ! -e /var/lib/ironic/ironic.db ]; then
255+ ironic-dbsync create_schema
256+ fi
257+ chown ironic:ironic -R /var/lib/ironic /etc/ironic
258 fi
259
260 #DEBHELPER#
261
262=== modified file 'debian/ironic_sudoers'
263--- debian/ironic_sudoers 2014-01-07 21:56:48 +0000
264+++ debian/ironic_sudoers 2014-10-03 22:31:55 +0000
265@@ -1,3 +1,3 @@
266 Defaults:ironic !requiretty
267
268-ironic ALL = (root) NOPASSWD: /usr/bin/ironic-rootwrap
269+ironic ALL = (root) NOPASSWD: /usr/bin/ironic-rootwrap /etc/ironic/rootwrap.conf *
270
271=== modified file 'debian/patches/series'
272--- debian/patches/series 2014-04-01 22:53:05 +0000
273+++ debian/patches/series 2014-10-03 22:31:55 +0000
274@@ -1,1 +1,1 @@
275-set_logdir.patch
276+set_config_defaults.patch
277
278=== added file 'debian/patches/set_config_defaults.patch'
279--- debian/patches/set_config_defaults.patch 1970-01-01 00:00:00 +0000
280+++ debian/patches/set_config_defaults.patch 2014-10-03 22:31:55 +0000
281@@ -0,0 +1,22 @@
282+diff --git a/etc/ironic/ironic.conf.sample b/etc/ironic/ironic.conf.sample
283+index 9ed172e..05769c8 100644
284+--- a/etc/ironic/ironic.conf.sample
285++++ b/etc/ironic/ironic.conf.sample
286+@@ -431,7 +431,7 @@
287+ # (Optional) The base directory used for relative --log-file
288+ # paths. (string value)
289+ # Deprecated group/name - [DEFAULT]/logdir
290+-#log_dir=<None>
291++log_dir=/var/log/ironic
292+
293+ # Use syslog for logging. Existing syslog format is DEPRECATED
294+ # during I, and will change in J to honor RFC5424. (boolean
295+@@ -621,7 +621,7 @@
296+ # Deprecated group/name - [DEFAULT]/sql_connection
297+ # Deprecated group/name - [DATABASE]/sql_connection
298+ # Deprecated group/name - [sql]/connection
299+-#connection=<None>
300++connection=sqlite:////var/lib/ironic/ironic.db
301+
302+ # The SQLAlchemy connection string to use to connect to the
303+ # slave database. (string value)
304
305=== removed file 'debian/patches/set_logdir.patch'
306--- debian/patches/set_logdir.patch 2014-07-07 12:29:16 +0000
307+++ debian/patches/set_logdir.patch 1970-01-01 00:00:00 +0000
308@@ -1,12 +0,0 @@
309-diff -Naurp ironic-2014.2.b1.orig/etc/ironic/ironic.conf.sample ironic-2014.2.b1/etc/ironic/ironic.conf.sample
310---- ironic-2014.2.b1.orig/etc/ironic/ironic.conf.sample 2014-06-12 11:53:47.000000000 -0400
311-+++ ironic-2014.2.b1/etc/ironic/ironic.conf.sample 2014-07-07 08:07:05.710927000 -0400
312-@@ -425,7 +425,7 @@
313- # (Optional) The base directory used for relative --log-file
314- # paths (string value)
315- # Deprecated group/name - [DEFAULT]/logdir
316--#log_dir=<None>
317-+log_dir=/var/log/ironic
318-
319- # Use syslog for logging. Existing syslog format is DEPRECATED
320- # during I, and then will be changed in J to honor RFC5424
321
322=== modified file 'debian/pydist-overrides'
323--- debian/pydist-overrides 2014-01-07 21:56:48 +0000
324+++ debian/pydist-overrides 2014-10-03 22:31:55 +0000
325@@ -1,1 +1,2 @@
326 argparse
327+pysendfile

Subscribers

People subscribed via source and target branches