OpenStack Compute (nova)

Merge lp:~gandelman-a/nova/iso8601 into lp:~openstack-ubuntu-packagers/nova/ubuntu

  1. iso8601
  2. Merge into ubuntu
Proposed by Adam Gandelman
Status: Needs review
Proposed branch: lp:~gandelman-a/nova/iso8601
Merge into: lp:~openstack-ubuntu-packagers/nova/ubuntu
Diff against target: 370 lines (+85/-52)
6 files modified
debian/changelog (+28/-2)
debian/control (+3/-10)
debian/nova.conf (+1/-1)
debian/patches/libvirt-use-console-pipe.patch (+37/-35)
debian/patches/series (+1/-1)
debian/rules (+15/-3)
To merge this branch: bzr merge lp:~gandelman-a/nova/iso8601
Reviewer Review Type Date Requested Status
OpenStack Ubuntu packagers Pending
Review via email: mp+93791@code.launchpad.net

Description of the change

New dependency: python-iso8601

To post a comment you must log in.

Unmerged revisions

313. By Adam Gandelman

debian/control: Add new dependency python-iso8601 to Build-Depends +
python-nova Depends

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 2012-02-13 17:01:11 +0000
3+++ debian/changelog 2012-02-20 10:08:22 +0000
4@@ -1,4 +1,21 @@
5-nova (2012.1~e4~20120211.12605-0ubuntu1) UNRELEASED; urgency=low
6+nova (2012.1~e4~20120217.12709-0ubuntu2) UNRELEASED; urgency=low
7+
8+ [ Adam Gandelman ]
9+ debian/control: Add new dependency python-iso8601 to Build-Depends +
10+ python-nova Depends
11+
12+ [ Monty Taylor ]
13+ * Move files from nova/locale to /usr/share/locale
14+
15+ [Chuck Short]
16+ * debian/rules: Fix FTBFS.
17+
18+ [ Chuck Short ]
19+ * Add depends on python-babel.
20+
21+ -- Chuck Short <zulcss@ubuntu.com> Sun, 19 Feb 2012 13:48:42 -0500
22+
23+nova (2012.1~e4~20120217.12709-0ubuntu1) precise; urgency=low
24
25 [ Dave Walker (Daviey) ]
26 * New upstream snapshot
27@@ -7,7 +24,16 @@
28 * debian/patches/libvirt-use-console-pipe.patch:
29 - Rebased against latest trunk
30
31- -- Dave Walker (Daviey) <DaveWalker@ubuntu.com> Sat, 11 Feb 2012 02:03:25 +0000
32+ [ Chuck Short ]
33+ * debian/nova.conf: Re-enable default iscsi_helper.
34+ * debian/nova.conf: More fixups.
35+ * debian/control: Dont depend and conflicts on nova-compute-
36+ hypervisor. (LP: #923681)
37+ * debian/patches/libvirt-us-console-pipe.patch: Refreshed.
38+ * Temporarily disable console patch. (LP: #932787)
39+ * New usptream version.
40+
41+ -- Chuck Short <zulcss@ubuntu.com> Fri, 17 Feb 2012 11:02:12 -0500
42
43 nova (2012.1~e4~20120210.12574-0ubuntu1) precise; urgency=low
44
45
46=== modified file 'debian/control'
47--- debian/control 2012-02-13 17:01:11 +0000
48+++ debian/control 2012-02-20 10:08:22 +0000
49@@ -42,6 +42,8 @@
50 python-xattr,
51 python-feedparser,
52 python-crypto,
53+ python-babel,
54+ python-iso8601,
55 pep8
56 Build-Conflicts: python-cjson
57 Standards-Version: 3.9.2
58@@ -84,6 +86,7 @@
59 python-xattr,
60 python-daemon,
61 python-suds,
62+ python-iso8601,
63 sudo,
64 ${misc:Depends}
65 Suggests: python-suds (>= 0.4.0),
66@@ -156,8 +159,6 @@
67 Architecture: all
68 Depends: nova-compute (= ${binary:Version}), python-libvirt, libvirt-bin, ${misc:Depends}
69 Provides: nova-compute-hypervisor
70-Replaces: nova-compute-hypervisor
71-Conflicts: nova-compute-hypervisor
72 Description: OpenStack Compute - compute node (LXC)
73 OpenStack is a reliable cloud infrastructure. Its mission is to produce
74 the ubiquitous cloud computing platform that will meet the needs of public
75@@ -179,8 +180,6 @@
76 Architecture: all
77 Depends: nova-compute (= ${binary:Version}), python-libvirt, libvirt-bin, user-mode-linux, ${misc:Depends}
78 Provides: nova-compute-hypervisor
79-Replaces: nova-compute-hypervisor
80-Conflicts: nova-compute-hypervisor
81 Description: OpenStack Compute - compute node (UserModeLinux)
82 OpenStack is a reliable cloud infrastructure. Its mission is to produce
83 the ubiquitous cloud computing platform that will meet the needs of public
84@@ -203,8 +202,6 @@
85 Depends: nova-compute (= ${binary:Version}), python-libvirt, libvirt-bin, xen-hypervisor-4.1-amd64 | xen-hypervisor-4.1-i386,
86 ${misc:Depends}
87 Provides: nova-compute-hypervisor
88-Replaces: nova-compute-hypervisor
89-Conflicts: nova-compute-hypervisor
90 Description: OpenStack Compute - compute node (Xen)
91 OpenStack is a reliable cloud infrastructure. Its mission is to produce
92 the ubiquitous cloud computing platform that will meet the needs of public
93@@ -226,8 +223,6 @@
94 Architecture: all
95 Depends: nova-compute (= ${binary:Version}), python-libvirt, libvirt-bin, qemu, ${misc:Depends}
96 Provides: nova-compute-hypervisor
97-Replaces: nova-compute-hypervisor
98-Conflicts: nova-compute-hypervisor
99 Description: OpenStack Compute - compute node (QEmu)
100 OpenStack is a reliable cloud infrastructure. Its mission is to produce
101 the ubiquitous cloud computing platform that will meet the needs of public
102@@ -249,8 +244,6 @@
103 Architecture: all
104 Depends: nova-compute (= ${binary:Version}), python-libvirt, libvirt-bin, kvm, ${misc:Depends}
105 Provides: nova-compute-hypervisor
106-Replaces: nova-compute-hypervisor
107-Conflicts: nova-compute-hypervisor
108 Description: OpenStack Compute - compute node (KVM)
109 OpenStack is a reliable cloud infrastructure. Its mission is to produce
110 the ubiquitous cloud computing platform that will meet the needs of public
111
112=== modified file 'debian/nova.conf'
113--- debian/nova.conf 2012-01-25 14:33:10 +0000
114+++ debian/nova.conf 2012-02-20 10:08:22 +0000
115@@ -3,8 +3,8 @@
116 --logdir=/var/log/nova
117 --state_path=/var/lib/nova
118 --lock_path=/var/lock/nova
119---use_deprecated_auth
120 --force_dhcp_release
121+--iscsi_helper=tgtadm
122 --libvirt_use_virtio_for_bridges
123 --connection_type=libvirt
124 --root_helper=sudo nova-rootwrap
125
126=== modified file 'debian/patches/libvirt-use-console-pipe.patch'
127--- debian/patches/libvirt-use-console-pipe.patch 2012-02-11 02:04:05 +0000
128+++ debian/patches/libvirt-use-console-pipe.patch 2012-02-20 10:08:22 +0000
129@@ -1,6 +1,7 @@
130---- a/Authors
131-+++ b/Authors
132-@@ -136,6 +136,7 @@
133+diff -Naurp nova.orig/Authors nova/Authors
134+--- nova.orig/Authors 2012-02-14 12:09:51.913338628 -0500
135++++ nova/Authors 2012-02-14 12:10:09.901337405 -0500
136+@@ -138,6 +138,7 @@ Renuka Apte <renuka.apte@citrix.com>
137 Ricardo Carrillo Cruz <emaildericky@gmail.com>
138 Rick Clark <rick@openstack.org>
139 Rick Harris <rconradharris@gmail.com>
140@@ -8,9 +9,10 @@
141 Rob Kost <kost@isi.edu>
142 Russell Bryant <rbryant@redhat.com>
143 Ryan Lane <rlane@wikimedia.org>
144---- a/nova/tests/test_libvirt.py
145-+++ b/nova/tests/test_libvirt.py
146-@@ -761,7 +761,7 @@
147+diff -Naurp nova.orig/nova/tests/test_libvirt.py nova/nova/tests/test_libvirt.py
148+--- nova.orig/nova/tests/test_libvirt.py 2012-02-14 12:09:51.997338631 -0500
149++++ nova/nova/tests/test_libvirt.py 2012-02-14 12:10:09.905337571 -0500
150+@@ -761,7 +761,7 @@ class LibvirtConnTestCase(test.TestCase)
151 (lambda t: _ipv4_like(t.findall(parameter)[1].get('value'),
152 '192.168.*.1'), True),
153 (lambda t: t.find('./devices/serial/source').get(
154@@ -19,7 +21,7 @@
155 (lambda t: t.find('./memory').text, '2097152')]
156 if rescue:
157 common_checks += [
158-@@ -1774,6 +1774,56 @@
159+@@ -1774,6 +1774,56 @@ class NWFilterTestCase(test.TestCase):
160 db.instance_destroy(admin_ctxt, instance_ref['id'])
161
162
163@@ -76,8 +78,9 @@
164 class LibvirtUtilsTestCase(test.TestCase):
165 def test_get_iscsi_initiator(self):
166 self.mox.StubOutWithMock(utils, 'execute')
167---- a/nova/tests/test_utils.py
168-+++ b/nova/tests/test_utils.py
169+diff -Naurp nova.orig/nova/tests/test_utils.py nova/nova/tests/test_utils.py
170+--- nova.orig/nova/tests/test_utils.py 2012-02-14 12:09:51.997338631 -0500
171++++ nova/nova/tests/test_utils.py 2012-02-14 12:10:09.905337571 -0500
172 @@ -17,11 +17,14 @@
173 import __builtin__
174 import mox
175@@ -93,7 +96,7 @@
176 import nova
177 from nova import exception
178 from nova import flags
179-@@ -700,3 +703,56 @@
180+@@ -700,3 +703,56 @@ class DeprecationTest(test.TestCase):
181 h1 = utils.hash_file(flo)
182 h2 = hashlib.sha1(data).hexdigest()
183 self.assertEquals(h1, h2)
184@@ -150,9 +153,10 @@
185 + f.close()
186 +
187 +
188---- a/nova/utils.py
189-+++ b/nova/utils.py
190-@@ -27,11 +27,13 @@
191+diff -Naurp nova.orig/nova/utils.py nova/nova/utils.py
192+--- nova.orig/nova/utils.py 2012-02-14 12:09:52.001338633 -0500
193++++ nova/nova/utils.py 2012-02-14 12:10:09.905337571 -0500
194+@@ -27,11 +27,13 @@ import inspect
195 import json
196 import lockfile
197 import os
198@@ -166,7 +170,7 @@
199 import struct
200 import sys
201 import time
202-@@ -52,6 +54,7 @@
203+@@ -52,6 +54,7 @@ from nova import log as logging
204 from nova.openstack.common import cfg
205
206
207@@ -174,7 +178,7 @@
208 LOG = logging.getLogger("nova.utils")
209 ISO_TIME_FORMAT = "%Y-%m-%dT%H:%M:%SZ"
210 PERFECT_TIME_FORMAT = "%Y-%m-%dT%H:%M:%S.%f"
211-@@ -1420,3 +1423,133 @@
212+@@ -1420,3 +1423,133 @@ def read_file_as_root(file_path):
213 return out
214 except exception.ProcessExecutionError:
215 raise exception.FileNotFound(file_path=file_path)
216@@ -308,9 +312,10 @@
217 + def close(self):
218 + self.f.close()
219 +
220---- a/nova/virt/libvirt/connection.py
221-+++ b/nova/virt/libvirt/connection.py
222-@@ -39,15 +39,19 @@
223+diff -Naurp nova.orig/nova/virt/libvirt/connection.py nova/nova/virt/libvirt/connection.py
224+--- nova.orig/nova/virt/libvirt/connection.py 2012-02-14 12:09:52.001338633 -0500
225++++ nova/nova/virt/libvirt/connection.py 2012-02-14 12:11:04.853340374 -0500
226+@@ -39,15 +39,19 @@ Supports KVM, LXC, QEMU, UML, and XEN.
227
228 """
229
230@@ -330,7 +335,7 @@
231 from eventlet import greenthread
232 from xml.dom import minidom
233 from xml.etree import ElementTree
234-@@ -141,6 +145,9 @@
235+@@ -138,6 +142,9 @@ libvirt_opts = [
236 cfg.BoolOpt('libvirt_use_virtio_for_bridges',
237 default=False,
238 help='Use virtio for bridge interfaces'),
239@@ -340,7 +345,7 @@
240 cfg.StrOpt('libvirt_disk_prefix',
241 default=None,
242 help='Override the default disk prefix for the devices attached'
243-@@ -179,6 +186,57 @@
244+@@ -176,6 +183,57 @@ def _get_eph_disk(ephemeral):
245 return 'disk.eph' + str(ephemeral['num'])
246
247
248@@ -398,7 +403,7 @@
249 class LibvirtConnection(driver.ComputeDriver):
250
251 def __init__(self, read_only):
252-@@ -212,6 +270,8 @@
253+@@ -209,6 +267,8 @@ class LibvirtConnection(driver.ComputeDr
254
255 self.image_cache_manager = imagecache.ImageCacheManager()
256
257@@ -407,7 +412,7 @@
258 @property
259 def host_state(self):
260 if not self._host_state:
261-@@ -220,7 +280,11 @@
262+@@ -217,7 +277,11 @@ class LibvirtConnection(driver.ComputeDr
263
264 def init_host(self, host):
265 # NOTE(nsokolov): moved instance restarting to ComputeManager
266@@ -420,7 +425,7 @@
267
268 @property
269 def libvirt_xml(self):
270-@@ -281,6 +345,15 @@
271+@@ -278,6 +342,15 @@ class LibvirtConnection(driver.ComputeDr
272 else:
273 return libvirt.openAuth(uri, auth, 0)
274
275@@ -436,15 +441,15 @@
276 def instance_exists(self, instance_id):
277 """Efficient override of base instance_exists method."""
278 try:
279-@@ -424,6 +497,7 @@
280+@@ -419,6 +492,7 @@ class LibvirtConnection(driver.ComputeDr
281 def _cleanup(self, instance):
282 target = os.path.join(FLAGS.instances_path, instance['name'])
283 instance_name = instance['name']
284-+ self._stop_console_logger(instance_name)
285- LOG.info(_('instance %(instance_name)s: deleting instance files'
286- ' %(target)s') % locals())
287++ self._stop_console_loger(instance_name)
288+ LOG.info(_('Deleting instance files %(target)s') % locals(),
289+ instance=instance)
290 if FLAGS.libvirt_type == 'lxc':
291-@@ -780,10 +854,10 @@
292+@@ -776,10 +850,10 @@ class LibvirtConnection(driver.ComputeDr
293
294 @exception.wrap_exception()
295 def get_console_output(self, instance):
296@@ -458,7 +463,7 @@
297
298 if FLAGS.libvirt_type == 'xen':
299 # Xen is special
300-@@ -791,14 +865,14 @@
301+@@ -787,12 +861,12 @@ class LibvirtConnection(driver.ComputeDr
302 'ttyconsole',
303 instance['name'])
304 data = self._flush_xen_console(virsh_output)
305@@ -466,17 +471,14 @@
306 + fpath = self._append_to_file(data, console_fifo)
307 elif FLAGS.libvirt_type == 'lxc':
308 # LXC is also special
309- LOG.info(_("Unable to read LXC console"))
310+ LOG.info(_("Unable to read LXC console"), instance=instance)
311 else:
312 - fpath = console_log
313 + fpath = console_fifo
314
315-- return libvirt_utils.load_file(fpath)
316-+ return self.console_loggers[instance['name']].peek()
317+ return libvirt_utils.load_file(fpath)
318
319- @staticmethod
320- def get_host_ip_addr():
321-@@ -934,7 +1008,24 @@
322+@@ -930,7 +1004,24 @@ class LibvirtConnection(driver.ComputeDr
323 libvirt_utils.ensure_tree(container_dir)
324
325 # NOTE(vish): No need add the suffix to console.log
326
327=== modified file 'debian/patches/series'
328--- debian/patches/series 2012-02-13 17:01:11 +0000
329+++ debian/patches/series 2012-02-20 10:08:22 +0000
330@@ -1,3 +1,3 @@
331 nova-manage_flagfile_location.patch
332 kombu_tests_timeout.patch
333-libvirt-use-console-pipe.patch
334+#libvirt-use-console-pipe.patch
335
336=== modified file 'debian/rules'
337--- debian/rules 2012-02-13 17:01:11 +0000
338+++ debian/rules 2012-02-20 10:08:22 +0000
339@@ -3,6 +3,12 @@
340 # Verbose mode
341 #export DH_VERBOSE=1
342
343+include /usr/share/python/python.mk
344+
345+PACKAGE_NAME=python-nova
346+debroot = debian/tmp
347+site_packages_dir=$(debroot)$(call py_libdir,$(shell pyversions -d))
348+
349 # Lucid does not have dh_python2, but we would like to be able to use this
350 # rules file to build on lucid as well. Thus the branching logic.
351 WITH_PYTHON2 = $(shell test -f /usr/bin/dh_python2 && echo "--with python2")
352@@ -52,9 +58,15 @@
353 --prefix=$(DEBIAN_NAME)-$(DEBIAN_VERSION)/
354
355
356-override_dh_install:
357- dh_install
358- chmod 440 $(CURDIR)/debian/nova-common/etc/sudoers.d/nova_sudoers
359+override_dh_auto_install:
360+ # python-nova
361+ python setup.py install -f --install-layout=deb --root=$(debroot)
362+ mkdir -p $(debroot)/usr/share
363+ mv $(site_packages_dir)/nova/locale $(debroot)/usr/share
364+ mkdir -p $(debroot)/usr/share/apport/package-hooks
365+
366+ # nova-common
367+ install -D -m 440 $(CURDIR)/debian/nova_sudoers $(CURDIR)/debian/nova-common/etc/sudoers.d/nova_sudoers
368 install -D -m 0664 $(CURDIR)/debian/nova-volume.default $(CURDIR)/debian/nova-volume/etc/default/nova-volume
369 for hypervisor in qemu kvm xen uml lxc; do \
370 install -D -m 0600 $(CURDIR)/debian/nova-compute-$${hypervisor}.conf $(CURDIR)/debian/nova-compute-$${hypervisor}/etc/nova/nova-compute.conf; \

Subscribers

People subscribed via source and target branches