Merge lp:~james-page/nova/compute-plus-others into lp:~ubuntu-server-dev/nova/icehouse

Proposed by James Page on 2013-12-12
Status: Merged
Approved by: Chuck Short on 2013-12-16
Approved revision: 647
Merged at revision: 642
Proposed branch: lp:~james-page/nova/compute-plus-others
Merge into: lp:~ubuntu-server-dev/nova/icehouse
Diff against target: 631 lines (+170/-117)
11 files modified
debian/changelog (+17/-2)
debian/control (+126/-91)
debian/nova-baremetal.install (+1/-1)
debian/nova-compute-uml.conf (+0/-4)
debian/nova-compute-uml.postinst (+0/-8)
debian/nova-compute-vmware.conf (+2/-0)
debian/nova-compute-vmware.postinst (+8/-0)
debian/nova-compute.upstart (+13/-8)
debian/nova-scheduler.install (+1/-1)
debian/nova-spiceproxy.logrotate (+1/-1)
debian/rules (+1/-1)
To merge this branch: bzr merge lp:~james-page/nova/compute-plus-others
Reviewer Review Type Date Requested Status
Ubuntu Server Developers 2013-12-12 Pending
Review via email: mp+198763@code.launchpad.net

Description of the change

See changelog for details.

To post a comment you must log in.
645. By James Page on 2013-12-12

* d/control: Drop BDI on openssh-client, no longer required.
* d/control: Drop dependency on curl, no longer required.
* d/control,rules,nova-compute-uml.*: Drop nova-compute-uml package.

646. By James Page on 2013-12-12

Resurect openssh-client usage

647. By James Page on 2013-12-12

Add missing vmware files

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 2013-12-12 14:08:51 +0000
3+++ debian/changelog 2013-12-12 16:36:45 +0000
4@@ -3,14 +3,29 @@
5 [ Chuck Short ]
6 * debian/patches/fix-libvirt-regression.patch: Dropped.
7 * debian/patches/sqlachemy-0.8.3-compat.patch: Refreshed.
8- * debian/control: Add python-pycadf as a dependency.
9- * debian/patches/fix-requirements.patch: Refreshed
10+ * debian/control: Add python-pycadf dependency.
11+ * debian/patches/fix-requirements.patch: Refreshed.
12
13 [ James Page ]
14 * d/nova-compute-*.conf: Update default hypervisor configurations
15 to use new libvirt section configuration.
16 * d/control: Bump version for stevedore to >= 0.12.
17 * d/p/*: Refreshed.
18+ * d/control: Add new nova-compute-libvirt package to support libvirt
19+ based hypervisors, rework dependencies for nova-compute{-*} to
20+ align to this approach (LP: #928834).
21+ * d/nova-compute.postinst: Renamed to nova-compute-libvirt.postinst
22+ as its only appropriate for libvirt based hypervisors.
23+ * d/control,nova-compute-vmware.*,rules: Add new nova-compute-vmware
24+ hypervisor package.
25+ * d/control: Add missing ebtables dependency for nova-network
26+ (LP: #1161338).
27+ * d/nova-compute.upstart: If libvirt-bin is installed, then wait
28+ for it to reach running state before starting nova-compute
29+ (LP: #907152, #1190280).
30+ * d/nova-spiceproxy.logrotate: Manage the correct log file (LP: #1259332).
31+ * d/control: Drop dependency on curl, no longer required.
32+ * d/control,rules,nova-compute-uml.*: Drop nova-compute-uml package.
33
34 -- Chuck Short <zulcss@ubuntu.com> Thu, 05 Dec 2013 15:08:16 -0500
35
36
37=== modified file 'debian/control'
38--- debian/control 2013-12-11 14:07:07 +0000
39+++ debian/control 2013-12-12 16:36:45 +0000
40@@ -4,10 +4,12 @@
41 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
42 XSBC-Original-Maintainer: Openstack Maintainers <openstack@lists.launchpad.net>
43 Uploaders: Soren Hansen <soren@ubuntu.com>, Thomas Goirand <zigo@debian.org>
44-Build-Depends: debhelper (>= 7.0.50),
45+Build-Depends:
46+ debhelper (>= 7.0.50),
47 python-all (>= 2.6),
48 python-all-dev (>= 2.6.6-3~)
49-Build-Depends-Indep: openssh-client,
50+Build-Depends-Indep:
51+ openssh-client,
52 openssl,
53 python-amqplib (>= 0.6.1),
54 python-anyjson (>= 0.3.3),
55@@ -18,20 +20,21 @@
56 python-crypto,
57 python-distutils-extra,
58 python-eventlet (>= 0.13.0),
59+ python-feedparser,
60 python-fixtures (>= 0.3.14),
61- python-feedparser,
62+ python-glanceclient (>= 1:0.9.0),
63 python-greenlet (>= 0.3.2),
64- python-glanceclient (>= 1:0.9.0),
65 python-iso8601,
66+ python-jinja2,
67+ python-jsonschema (>= 1.3.0),
68 python-keystoneclient (>= 1:0.3.2),
69 python-kombu (>= 2.5.12),
70- python-jsonschema (>= 1.3.0),
71- python-jinja2,
72 python-lxml (>= 2.3),
73 python-migrate (>= 0.8.2),
74 python-mock,
75 python-mox,
76 python-netaddr (>= 0.7.6),
77+ python-neutronclient (>= 1:2.3.0),
78 python-oslo.config (>= 1:1.2.0),
79 python-oslo.sphinx,
80 python-paramiko (>= 1.8.0),
81@@ -40,13 +43,12 @@
82 python-pbr (>= 0.5.21),
83 python-pyasn1,
84 python-pycadf (>= 0.1.9),
85- python-neutronclient (>= 1:2.3.0),
86 python-routes,
87 python-setuptools,
88 python-six (>= 1.4.1),
89- python-stevedore (>= 0.12),
90 python-sphinx (>> 1.0),
91 python-sqlalchemy-ext ( >= 0.7.8-1~) | python-sqlalchemy,
92+ python-stevedore (>= 0.12),
93 python-suds,
94 python-testtools (>= 0.9.32),
95 python-webob (>= 1.2.3),
96@@ -63,7 +65,8 @@
97 Package: python-nova
98 Architecture: all
99 Section: python
100-Depends: openssh-client,
101+Depends:
102+ openssh-client,
103 openssl,
104 python-amqplib (>= 0.6.1),
105 python-anyjson (>= 0.3.3),
106@@ -71,29 +74,29 @@
107 python-boto (>= 2.4.0),
108 python-cinderclient (>= 1:1.0.5),
109 python-eventlet (>= 0.13.0),
110+ python-glanceclient (>= 1:0.9.0),
111 python-greenlet (>= 0.3.2),
112- python-glanceclient (>= 1:0.9.0),
113- python-keystoneclient (>= 1:0.3.2),
114- python-neutronclient (>= 1:2.3.0),
115 python-iso8601,
116 python-jinja2,
117 python-jsonschema (>= 1.3.0),
118+ python-keystoneclient (>= 1:0.3.2),
119 python-kombu (>= 2.5.12),
120 python-lxml (>= 2.3),
121 python-m2crypto,
122 python-migrate,
123 python-netaddr (>= 0.7.6),
124+ python-neutronclient (>= 1:2.3.0),
125 python-oslo.config (>= 1:1.2.0),
126 python-paramiko (>= 1.8.0),
127 python-paste,
128 python-pastedeploy (>= 1.5.0),
129+ python-pyasn1,
130+ python-pycadf (>= 0.1.9),
131 python-routes,
132+ python-simplejson,
133 python-six,
134- python-simplejson,
135 python-sqlalchemy-ext ( >= 0.7.8-1~) | python-sqlalchemy (<< 0.6.3-2),
136 python-stevedore (>= 0.12),
137- python-pyasn1,
138- python-pycadf (>= 0.1.9),
139 python-suds,
140 python-webob (>= 1.2.3),
141 sudo,
142@@ -123,7 +126,8 @@
143
144 Package: nova-common
145 Architecture: all
146-Depends: adduser,
147+Depends:
148+ adduser,
149 python-nova (= ${binary:Version}),
150 ${misc:Depends},
151 ${python:Depends}
152@@ -148,24 +152,48 @@
153
154 Package: nova-compute
155 Architecture: all
156-Depends: curl,
157+Depends:
158+ nova-common (= ${binary:Version}),
159+ nova-compute-kvm | nova-compute-hypervisor,
160+ ${misc:Depends},
161+ ${python:Depends}
162+Description: OpenStack Compute - compute node base
163+ OpenStack is a reliable cloud infrastructure. Its mission is to produce
164+ the ubiquitous cloud computing platform that will meet the needs of public
165+ and private cloud providers regardless of size, by being simple to implement
166+ and massively scalable.
167+ .
168+ OpenStack Compute, codenamed Nova, is a cloud computing fabric controller. In
169+ addition to its "native" API (the OpenStack API), it also supports the Amazon
170+ EC2 API.
171+ .
172+ Nova is intended to be modular and easy to extend and adapt. It supports many
173+ different hypervisors (KVM and Xen to name a few), different database backends
174+ (SQLite, MySQL, and PostgreSQL, for instance), different types of user
175+ databases (LDAP or SQL), etc.
176+ .
177+ This is the package you will install on the nodes that will run your
178+ virtual machines.
179+
180+Package: nova-compute-libvirt
181+Architecture: all
182+Depends:
183+ adduser,
184 ebtables,
185- gawk,
186+ genisoimage,
187 iptables,
188 kpartx,
189- lsb-base (>= 3.0.6),
190- nova-common (= ${binary:Version}),
191- nova-compute-kvm | nova-compute-hypervisor,
192+ libvirt-bin,
193+ nova-compute (= ${binary:Version}),
194 open-iscsi,
195 parted,
196+ python-libvirt,
197 qemu-utils,
198- genisoimage,
199 vlan,
200 ${misc:Depends},
201- ${python:Depends},
202- adduser
203-Suggests: guestmount, sysfsutils, sg3-utils, multipath-tools
204-Description: OpenStack Compute - compute node
205+ ${python:Depends}
206+Suggests: guestmount, multipath-tools, sg3-utils, sysfsutils
207+Description: OpenStack Compute - compute node libvirt support
208 OpenStack is a reliable cloud infrastructure. Its mission is to produce
209 the ubiquitous cloud computing platform that will meet the needs of public
210 and private cloud providers regardless of size, by being simple to implement
211@@ -180,15 +208,12 @@
212 (SQLite, MySQL, and PostgreSQL, for instance), different types of user
213 databases (LDAP or SQL), etc.
214 .
215- This is the package you will install on the nodes that will run your
216- virtual machines.
217+ This package provides common dependencies and setup for all libvirt based
218+ hypervisor options.
219
220 Package: nova-compute-lxc
221 Architecture: all
222-Depends: libvirt-bin,
223- nova-compute (= ${binary:Version}),
224- python-libvirt,
225- ${misc:Depends}
226+Depends: nova-compute-libvirt (= ${binary:Version}), ${misc:Depends}
227 Provides: nova-compute-hypervisor
228 Conflicts: nova-compute-hypervisor
229 Description: OpenStack Compute - compute node (LXC)
230@@ -208,37 +233,10 @@
231 .
232 Install this package on your compute nodes if you're using LXC.
233
234-Package: nova-compute-uml
235-Architecture: all
236-Depends: libvirt-bin,
237- nova-compute (= ${binary:Version}),
238- python-libvirt,
239- user-mode-linux,
240- ${misc:Depends}
241-Provides: nova-compute-hypervisor
242-Conflicts: nova-compute-hypervisor
243-Description: OpenStack Compute - compute node (UserModeLinux)
244- OpenStack is a reliable cloud infrastructure. Its mission is to produce
245- the ubiquitous cloud computing platform that will meet the needs of public
246- and private cloud providers regardless of size, by being simple to implement
247- and massively scalable.
248- .
249- OpenStack Compute, codenamed Nova, is a cloud computing fabric controller. In
250- addition to its "native" API (the OpenStack API), it also supports the Amazon
251- EC2 API.
252- .
253- Nova is intended to be modular and easy to extend and adapt. It supports many
254- different hypervisors (KVM and Xen to name a few), different database backends
255- (SQLite, MySQL, and PostgreSQL, for instance), different types of user
256- databases (LDAP or SQL), etc.
257- .
258- Install this package on your compute nodes if you're using UserModeLinux.
259-
260 Package: nova-compute-xen
261 Architecture: all
262-Depends: libvirt-bin,
263- nova-compute (= ${binary:Version}),
264- python-libvirt,
265+Depends:
266+ nova-compute-libvirt (= ${binary:Version}),
267 xen-system-amd64 | xen-system-i386,
268 ${misc:Depends}
269 Provides: nova-compute-hypervisor
270@@ -262,11 +260,7 @@
271
272 Package: nova-compute-qemu
273 Architecture: all
274-Depends: libvirt-bin,
275- nova-compute (= ${binary:Version}),
276- python-libvirt,
277- qemu,
278- ${misc:Depends}
279+Depends: nova-compute-libvirt (= ${binary:Version}), qemu, ${misc:Depends}
280 Provides: nova-compute-hypervisor
281 Conflicts: nova-compute-hypervisor
282 Description: OpenStack Compute - compute node (QEmu)
283@@ -288,10 +282,9 @@
284
285 Package: nova-compute-kvm
286 Architecture: all
287-Depends: qemu-system (>= 1.3.0) | kvm,
288- libvirt-bin,
289- nova-compute (= ${binary:Version}),
290- python-libvirt,
291+Depends:
292+ nova-compute-libvirt (= ${binary:Version}),
293+ qemu-system (>= 1.3.0) | kvm,
294 ${misc:Depends}
295 Provides: nova-compute-hypervisor
296 Conflicts: nova-compute-hypervisor
297@@ -312,9 +305,34 @@
298 .
299 Install this package on your compute nodes if you're using kvm.
300
301+Package: nova-compute-vmware
302+Architecture: all
303+Depends:
304+ nova-compute (= ${binary:Version}),
305+ ${misc:Depends}
306+Provides: nova-compute-hypervisor
307+Conflicts: nova-compute-hypervisor
308+Description: OpenStack Compute - compute node (VMware)
309+ OpenStack is a reliable cloud infrastructure. Its mission is to produce
310+ the ubiquitous cloud computing platform that will meet the needs of public
311+ and private cloud providers regardless of size, by being simple to implement
312+ and massively scalable.
313+ .
314+ OpenStack Compute, codenamed Nova, is a cloud computing fabric controller. In
315+ addition to its "native" API (the OpenStack API), it also supports the Amazon
316+ EC2 API.
317+ .
318+ Nova is intended to be modular and easy to extend and adapt. It supports many
319+ different hypervisors (KVM and Xen to name a few), different database backends
320+ (SQLite, MySQL, and PostgreSQL, for instance), different types of user
321+ databases (LDAP or SQL), etc.
322+ .
323+ Install this package on your compute nodes if you're using VMware vCenter.
324+
325 Package: nova-conductor
326 Architecture: all
327-Depends: nova-common (= ${binary:Version}),
328+Depends:
329+ nova-common (= ${binary:Version}),
330 ${misc:Depends},
331 ${ostack-lsb-base},
332 ${python:Depends}
333@@ -337,7 +355,8 @@
334
335 Package: nova-cert
336 Architecture: all
337-Depends: nova-common (= ${binary:Version}),
338+Depends:
339+ nova-common (= ${binary:Version}),
340 ${misc:Depends},
341 ${ostack-lsb-base},
342 ${python:Depends}
343@@ -360,7 +379,8 @@
344
345 Package: nova-scheduler
346 Architecture: all
347-Depends: nova-common (= ${binary:Version}),
348+Depends:
349+ nova-common (= ${binary:Version}),
350 ${misc:Depends},
351 ${ostack-lsb-base},
352 ${python:Depends}
353@@ -385,7 +405,7 @@
354 Section: oldlibs
355 Priority: extra
356 Architecture: all
357-Depends: cinder-volume, cinder-api, cinder-scheduler, ${misc:Depends}
358+Depends: cinder-api, cinder-scheduler, cinder-volume, ${misc:Depends}
359 Description: OpenStack Compute - storage
360 OpenStack is a reliable cloud infrastructure. Its mission is to produce
361 the ubiquitous cloud computing platform that will meet the needs of public
362@@ -407,7 +427,8 @@
363 Architecture: all
364 Section: oldlibs
365 Priority: extra
366-Depends: nova-common (= ${binary:Version}),
367+Depends:
368+ nova-common (= ${binary:Version}),
369 ${misc:Depends},
370 ${ostack-lsb-base},
371 ${python:Depends}
372@@ -430,7 +451,8 @@
373
374 Package: nova-novncproxy
375 Architecture: all
376-Depends: nova-common (= ${binary:Version}),
377+Depends:
378+ nova-common (= ${binary:Version}),
379 novnc,
380 websockify,
381 ${misc:Depends},
382@@ -456,7 +478,8 @@
383
384 Package: nova-xvpvncproxy
385 Architecture: all
386-Depends: nova-common (= ${binary:Version}),
387+Depends:
388+ nova-common (= ${binary:Version}),
389 ${misc:Depends},
390 ${ostack-lsb-base},
391 ${python:Depends}
392@@ -480,9 +503,10 @@
393
394 Package: nova-spiceproxy
395 Architecture: all
396-Depends: nova-common (= ${binary:Version}),
397- websockify,
398+Depends:
399+ nova-common (= ${binary:Version}),
400 spice-html5,
401+ websockify,
402 ${misc:Depends},
403 ${ostack-lsb-base},
404 ${python:Depends}
405@@ -506,11 +530,12 @@
406
407 Package: nova-api
408 Architecture: all
409-Depends: nova-common (= ${binary:Version}),
410+Depends:
411+ iptables,
412+ nova-common (= ${binary:Version}),
413 ${misc:Depends},
414 ${ostack-lsb-base},
415- ${python:Depends},
416- iptables
417+ ${python:Depends}
418 Description: OpenStack Compute - API frontend
419 OpenStack is a reliable cloud infrastructure. Its mission is to produce
420 the ubiquitous cloud computing platform that will meet the needs of public
421@@ -530,7 +555,9 @@
422
423 Package: nova-network
424 Architecture: all
425-Depends: bridge-utils,
426+Depends:
427+ bridge-utils,
428+ ebtables,
429 dnsmasq-base,
430 dnsmasq-utils,
431 iptables,
432@@ -565,7 +592,8 @@
433
434 Package: nova-objectstore
435 Architecture: all
436-Depends: nova-common (= ${binary:Version}),
437+Depends:
438+ nova-common (= ${binary:Version}),
439 ${misc:Depends},
440 ${ostack-lsb-base},
441 ${python:Depends}
442@@ -589,7 +617,8 @@
443
444 Package: nova-console
445 Architecture: all
446-Depends: nova-common (= ${binary:Version}),
447+Depends:
448+ nova-common (= ${binary:Version}),
449 ${misc:Depends},
450 ${ostack-lsb-base},
451 ${python:Depends}
452@@ -615,7 +644,8 @@
453
454 Package: nova-consoleauth
455 Architecture: all
456-Depends: nova-common (= ${binary:Version}),
457+Depends:
458+ nova-common (= ${binary:Version}),
459 ${misc:Depends},
460 ${ostack-lsb-base},
461 ${python:Depends}
462@@ -664,7 +694,8 @@
463
464 Package: nova-api-metadata
465 Architecture: all
466-Depends: nova-common (= ${binary:Version}),
467+Depends:
468+ nova-common (= ${binary:Version}),
469 ${misc:Depends},
470 ${ostack-lsb-base},
471 ${python:Depends}
472@@ -683,7 +714,8 @@
473
474 Package: nova-api-os-compute
475 Architecture: all
476-Depends: nova-common (= ${binary:Version}),
477+Depends:
478+ nova-common (= ${binary:Version}),
479 ${misc:Depends},
480 ${ostack-lsb-base},
481 ${python:Depends}
482@@ -719,7 +751,8 @@
483
484 Package: nova-api-ec2
485 Architecture: all
486-Depends: nova-common (= ${binary:Version}),
487+Depends:
488+ nova-common (= ${binary:Version}),
489 ${misc:Depends},
490 ${ostack-lsb-base},
491 ${python:Depends}
492@@ -743,7 +776,8 @@
493
494 Package: nova-cells
495 Architecture: all
496-Depends: nova-common (= ${binary:Version}),
497+Depends:
498+ nova-common (= ${binary:Version}),
499 ${misc:Depends},
500 ${ostack-lsb-base},
501 ${python:Depends}
502@@ -766,7 +800,8 @@
503
504 Package: nova-baremetal
505 Architecture: all
506-Depends: nova-common (= ${binary:Version}),
507+Depends:
508+ nova-common (= ${binary:Version}),
509 ${misc:Depends},
510 ${ostack-lsb-base},
511 ${python:Depends}
512
513=== modified file 'debian/nova-baremetal.install'
514--- debian/nova-baremetal.install 2013-01-11 02:05:18 +0000
515+++ debian/nova-baremetal.install 2013-12-12 16:36:45 +0000
516@@ -1,2 +1,2 @@
517+usr/bin/nova-baremetal-deploy-helper
518 usr/bin/nova-baremetal-manage
519-usr/bin/nova-baremetal-deploy-helper
520
521=== renamed file 'debian/nova-compute.postinst' => 'debian/nova-compute-libvirt.postinst'
522=== removed file 'debian/nova-compute-uml.conf'
523--- debian/nova-compute-uml.conf 2013-12-10 18:21:29 +0000
524+++ debian/nova-compute-uml.conf 1970-01-01 00:00:00 +0000
525@@ -1,4 +0,0 @@
526-[DEFAULT]
527-compute_driver=libvirt.LibvirtDriver
528-[libvirt]
529-virt_type=uml
530
531=== removed file 'debian/nova-compute-uml.postinst'
532--- debian/nova-compute-uml.postinst 2012-03-31 00:18:30 +0000
533+++ debian/nova-compute-uml.postinst 1970-01-01 00:00:00 +0000
534@@ -1,8 +0,0 @@
535-#!/bin/sh -e
536-
537-if [ "$1" = "configure" ]; then
538- chown nova:nova /etc/nova/nova-compute.conf
539- chmod 0600 /etc/nova/nova-compute.conf
540-fi
541-
542-#DEBHELPER#
543
544=== added file 'debian/nova-compute-vmware.conf'
545--- debian/nova-compute-vmware.conf 1970-01-01 00:00:00 +0000
546+++ debian/nova-compute-vmware.conf 2013-12-12 16:36:45 +0000
547@@ -0,0 +1,2 @@
548+[DEFAULT]
549+compute_driver=vmwareapi.VMwareVCDriver
550
551=== added file 'debian/nova-compute-vmware.postinst'
552--- debian/nova-compute-vmware.postinst 1970-01-01 00:00:00 +0000
553+++ debian/nova-compute-vmware.postinst 2013-12-12 16:36:45 +0000
554@@ -0,0 +1,8 @@
555+#!/bin/sh -e
556+
557+if [ "$1" = "configure" ]; then
558+ chown nova:nova /etc/nova/nova-compute.conf
559+ chmod 0600 /etc/nova/nova-compute.conf
560+fi
561+
562+#DEBHELPER#
563
564=== modified file 'debian/nova-compute.upstart'
565--- debian/nova-compute.upstart 2012-12-06 17:46:39 +0000
566+++ debian/nova-compute.upstart 2013-12-12 16:36:45 +0000
567@@ -1,20 +1,25 @@
568+# vim: set ft=upstart et ts=2:
569 description "Nova compute worker"
570 author "Soren Hansen <soren@linux2go.dk>"
571
572 start on runlevel [2345]
573 stop on runlevel [!2345]
574
575-
576 chdir /var/run
577
578 pre-start script
579- mkdir -p /var/run/nova
580- chown nova:root /var/run/nova/
581-
582- mkdir -p /var/lock/nova
583- chown nova:root /var/lock/nova/
584-
585- modprobe nbd
586+ mkdir -p /var/run/nova
587+ chown nova:root /var/run/nova/
588+
589+ mkdir -p /var/lock/nova
590+ chown nova:root /var/lock/nova/
591+
592+ modprobe nbd
593+
594+ # If libvirt-bin is installed, always wait for it to start first
595+ if status libvirt-bin; then
596+ start wait-for-state WAIT_FOR=libvirt-bin WAIT_STATE=running WAITER=nova-compute
597+ fi
598 end script
599
600 exec start-stop-daemon --start --chuid nova --exec /usr/bin/nova-compute -- --config-file=/etc/nova/nova.conf --config-file=/etc/nova/nova-compute.conf
601
602=== modified file 'debian/nova-scheduler.install'
603--- debian/nova-scheduler.install 2012-11-08 13:54:40 +0000
604+++ debian/nova-scheduler.install 2013-12-12 16:36:45 +0000
605@@ -1,3 +1,3 @@
606-usr/bin/nova-scheduler
607 usr/bin/nova-clear-rabbit-queues
608 usr/bin/nova-rpc-zmq-receiver
609+usr/bin/nova-scheduler
610
611=== modified file 'debian/nova-spiceproxy.logrotate'
612--- debian/nova-spiceproxy.logrotate 2013-01-22 15:43:41 +0000
613+++ debian/nova-spiceproxy.logrotate 2013-12-12 16:36:45 +0000
614@@ -1,4 +1,4 @@
615-/var/log/nova/nova-novncproxy.log {
616+/var/log/nova/nova-spiceproxy.log {
617 daily
618 missingok
619 compress
620
621=== modified file 'debian/rules'
622--- debian/rules 2013-12-05 16:25:44 +0000
623+++ debian/rules 2013-12-12 16:36:45 +0000
624@@ -38,7 +38,7 @@
625 chmod 440 $(CURDIR)/debian/nova-common/etc/sudoers.d/nova_sudoers
626 install -D -m 644 debian/source_nova.py debian/php5-common/usr/share/apport/package-hooks/source_nova.py
627 install -D -m 0644 $(CURDIR)/etc/nova/logging_sample.conf $(CURDIR)/debian/nova-common/etc/nova/logging.conf
628- for hypervisor in qemu kvm xen uml lxc; do \
629+ for hypervisor in qemu kvm xen lxc vmware; do \
630 install -D -m 0600 $(CURDIR)/debian/nova-compute-$${hypervisor}.conf $(CURDIR)/debian/nova-compute-$${hypervisor}/etc/nova/nova-compute.conf; \
631 done
632

Subscribers

People subscribed via source and target branches