OpenStack Compute (nova)

Merge lp:~soren/nova/essex-stable-catchup into lp:~ubuntu-server-dev/nova/diablo

  1. essex-stable-catchup
  2. Merge into diablo
Proposed by Soren Hansen
Status: Rejected
Rejected by: Soren Hansen
Proposed branch: lp:~soren/nova/essex-stable-catchup
Merge into: lp:~ubuntu-server-dev/nova/diablo
Diff against target: 5406 lines (+3604/-748) (has conflicts)
126 files modified
debian/README.xcp_and_openstack (+243/-0)
debian/api-paste.ini (+0/-114)
debian/changelog (+544/-1)
debian/control (+253/-20)
debian/copyright (+10/-7)
debian/debian_control_vars (+0/-3)
debian/gbp.conf (+6/-0)
debian/mans/nova-api-ec2.8 (+20/-0)
debian/mans/nova-api-metadata.8 (+20/-0)
debian/mans/nova-api-os-compute.8 (+20/-0)
debian/mans/nova-api-os-volume.8 (+20/-0)
debian/mans/nova-cert.8 (+20/-0)
debian/mans/nova-console.8 (+20/-0)
debian/mans/nova-consoleauth.8 (+20/-0)
debian/mans/nova-rootwrap.8 (+20/-0)
debian/nova-ajax-console-proxy.init (+0/-73)
debian/nova-ajax-console-proxy.install (+0/-1)
debian/nova-ajax-console-proxy.logrotate (+0/-4)
debian/nova-ajax-console-proxy.manpages (+0/-1)
debian/nova-ajax-console-proxy.upstart.in (+0/-18)
debian/nova-api-ec2.init (+76/-0)
debian/nova-api-ec2.install (+1/-0)
debian/nova-api-ec2.logrotate (+4/-0)
debian/nova-api-ec2.manpages (+1/-0)
debian/nova-api-ec2.upstart.in (+18/-0)
debian/nova-api-metadata.init (+76/-0)
debian/nova-api-metadata.install (+1/-0)
debian/nova-api-metadata.logrotate (+4/-0)
debian/nova-api-metadata.manpages (+1/-0)
debian/nova-api-metadata.upstart.in (+18/-0)
debian/nova-api-os-compute.init (+76/-0)
debian/nova-api-os-compute.install (+1/-0)
debian/nova-api-os-compute.logrotate (+4/-0)
debian/nova-api-os-compute.manpages (+1/-0)
debian/nova-api-os-compute.upstart.in (+18/-0)
debian/nova-api-os-volume.init (+76/-0)
debian/nova-api-os-volume.install (+1/-0)
debian/nova-api-os-volume.logrotate (+4/-0)
debian/nova-api-os-volume.manpages (+1/-0)
debian/nova-api-os-volume.upstart.in (+18/-0)
debian/nova-api.init (+77/-56)
debian/nova-api.install (+0/-1)
debian/nova-api.upstart.in (+1/-1)
debian/nova-cert.init (+71/-0)
debian/nova-cert.install (+1/-0)
debian/nova-cert.logrotate (+4/-0)
debian/nova-cert.manpages (+1/-0)
debian/nova-cert.upstart.in (+18/-0)
debian/nova-common.install (+4/-0)
debian/nova-common.manpages (+2/-0)
debian/nova-common.manpages.in (+0/-1)
debian/nova-common.nova-manage.logrotate (+4/-0)
debian/nova-common.postinst (+42/-6)
debian/nova-compute-kvm.postinst (+8/-0)
debian/nova-compute-lxc.postinst (+8/-0)
debian/nova-compute-qemu.conf (+1/-0)
debian/nova-compute-qemu.postinst (+8/-0)
debian/nova-compute-uml.postinst (+8/-0)
debian/nova-compute-xen.postinst (+8/-0)
debian/nova-compute.init (+78/-53)
debian/nova-compute.pyinstall (+1/-0)
debian/nova-compute.upstart.in (+1/-1)
debian/nova-console.init (+97/-0)
debian/nova-console.install (+1/-0)
debian/nova-console.logrotate (+5/-0)
debian/nova-console.manpages (+1/-0)
debian/nova-console.upstart.in (+19/-0)
debian/nova-consoleauth.init (+97/-0)
debian/nova-consoleauth.install (+1/-0)
debian/nova-consoleauth.logrotate (+5/-0)
debian/nova-consoleauth.manpages (+1/-0)
debian/nova-consoleauth.upstart.in (+19/-0)
debian/nova-doc.docs (+1/-1)
debian/nova-doc.links (+7/-0)
debian/nova-network.init (+77/-51)
debian/nova-network.nova-dhcpbridge.logrotate (+4/-0)
debian/nova-network.pyinstall (+1/-0)
debian/nova-network.upstart.in (+1/-1)
debian/nova-objectstore.init (+77/-51)
debian/nova-objectstore.logrotate (+1/-5)
debian/nova-objectstore.upstart.in (+1/-1)
debian/nova-scheduler.init (+76/-50)
debian/nova-scheduler.upstart.in (+1/-1)
debian/nova-vncproxy.install (+1/-1)
debian/nova-vncproxy.upstart.in (+1/-1)
debian/nova-volume.default (+2/-3)
debian/nova-volume.init (+91/-59)
debian/nova-volume.pyinstall (+1/-0)
debian/nova-volume.upstart.in (+4/-1)
debian/nova-xcp-network.init (+167/-0)
debian/nova-xcp-network.install (+6/-0)
debian/nova-xcp-plugins.docs (+1/-0)
debian/nova-xcp-plugins.install (+6/-0)
debian/nova-xcp-plugins.postinst (+13/-0)
debian/nova-xcp-plugins.postrm (+11/-0)
debian/nova-xvpvncproxy.init (+97/-0)
debian/nova-xvpvncproxy.install (+1/-0)
debian/nova-xvpvncproxy.logrotate (+4/-0)
debian/nova.conf (+5/-2)
debian/nova_sudoers (+3/-48)
debian/patches/0001-fix-useexisting-deprecation-warnings.patch (+52/-0)
debian/patches/backport-lxc-container-console-fix.patch (+0/-43)
debian/patches/fix-docs-build-without-network.patch (+15/-0)
debian/patches/fix-ubuntu-tests.patch (+15/-0)
debian/patches/kombu_tests_timeout.patch (+11/-0)
debian/patches/nova-console-monitor.patch (+138/-0)
debian/patches/nova-manage_flagfile_location.patch (+8/-9)
debian/patches/packaged-ajaxterm-calls.patch (+0/-19)
debian/patches/path-to-the-xenhost.conf-fixup.patch (+12/-0)
debian/patches/series (+10/-0)
debian/patches/upstream/0001-fix-bug-where-nova-ignores-glance-host-in-imageref.patch (+51/-0)
debian/patches/upstream/0002-Stop-libvirt-test-from-deleting-instances-dir.patch (+69/-0)
debian/patches/upstream/0003-Allow-unprivileged-RADOS-users-to-access-rbd-volumes.patch (+155/-0)
debian/patches/upstream/0004-Fixed-bug-962840-added-a-test-case.patch (+73/-0)
debian/patches/upstream/0005-Populate-image-properties-with-project_id-again.patch (+53/-0)
debian/patches/upstream/0006-Use-project_id-in-ec2.cloud._format_image.patch (+31/-0)
debian/pydist-overrides (+2/-0)
debian/python-nova.install (+0/-1)
debian/python-nova.postinst (+0/-12)
debian/python-nova.pyremove (+3/-0)
debian/pyversions (+0/-1)
debian/rules (+34/-22)
debian/source_nova.py (+1/-1)
debian/ubuntu_control_vars (+0/-2)
debian/watch (+1/-1)
debian/xen-openvswitch-nova.rules (+1/-0)
Text conflict in debian/changelog
Contents conflict in debian/patches/backport-libvirt-console-pipe.patch
Text conflict in debian/patches/series
To merge this branch: bzr merge lp:~soren/nova/essex-stable-catchup
Reviewer Review Type Date Requested Status
Soren Hansen (community) Disapprove
Review via email: mp+107356@code.launchpad.net

Description of the change

Update packaging to work with Essex stable branch.

Note: "work" == "can at least build a source package"

To post a comment you must log in.
Revision history for this message
Soren Hansen (soren) wrote :

What? No, I didn't want to merge this into the diablo branch at all.

review: Disapprove

Unmerged revisions

370. By Soren Hansen

* Snapshot of upstream stable/essex branch.
* Remove local copies of upstream patch set as upstream is nice
  enough to publish tarballs with everything included.

369. By Chuck Short

releasing version 2012.1-0ubuntu2

368. By Chuck Short

  - b1d11b8 Use project_id in ec2.cloud._format_image()
  - 6e988ed Fixes image publication using deprecated auth. (LP: #977765)

367. By Chuck Short

Refreshed rbd volumes patch

366. By Chuck Short

* debian/rules: Properly create empty doc/build/man dir for builds that
  skip doc building
* debian/control: Set 'Conflicts: nova-compute-hypervisor' for the various
  nova-compute-$type packages. (LP: #975616)
* debian/control: Set 'Breaks: nova-api' for the various nova-api-$service
  sub-packages. (LP: #966115)
* Resynchronize with stable/essex:
  - Fixes image publication using deprecated auth. (LP: #977765)
  - 6e988ed Populate image properties with project_id again
  - 3b14c74 Fixed bug 962840, added a test case.
  - d4e96fe Allow unprivileged RADOS users to access rbd volumes.
  - 4acfab6 Stop libvirt test from deleting instances dir
  - 155c7b2 fix bug where nova ignores glance host in imageref
* debian/nova.conf: Enabled ec2_private_dns_show_ip so that juju can
  connect to openstack instances.
* debian/patches/fix-docs-build-without-network.patch: Fix docs build
  when there is no network access.

365. By Chuck Short

releasing version 2012.1-0ubuntu1

364. By Chuck Short

releasing version 2012.1~rc4-0ubuntu1

363. By Chuck Short

* debian/patches/nova-console-monitor.patch: Disabled.
* debian/nova.conf: Removed console-monitor-patch

362. By Chuck Short

Prep for rc4 release.

361. By Chuck Short

debian/patches/nova-console-monitor.patch: Refreshed.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'debian/README.xcp_and_openstack'
2--- debian/README.xcp_and_openstack 1970-01-01 00:00:00 +0000
3+++ debian/README.xcp_and_openstack 2012-05-25 10:20:02 +0000
4@@ -0,0 +1,243 @@
5+This file intends to be a quick howto on how to setup openstack together with
6+XCP. This should also apply to the commercial version of XCP: XenServer, but
7+this hasn't been tested by the author of this file.
8+
9+1/ Setting-up XCP
10+-----------------
11+Please follow the XCP README.Debian howto. Make sure that you can create,
12+boot, shutdown and destroy virtual machines using the xe command line.
13+
14+2/ Setting-up a domU to install openstack on it
15+-----------------------------------------------
16+Best way to setup Openstack with XCP is to set it up in a XCP domU. Again,
17+follow the XCP README.debian located in /usr/share/doc/xcp-xapi once you have
18+installed the XenAPI package (eg: apt-get install xcp-xapi).
19+
20+About 1GB of RAM should be enough for your first Openstack domU.
21+
22+With nova-compute-kvm, you would install nova-compute on each physical server.
23+Not with nova-compute-xen. Here, you need only one instance of nova-compute,
24+which will "talk" to XenAPI. XCP will then manage pooling of servers and
25+storage.
26+
27+3/ Preparing the server
28+-----------------------
29+You may want to lower the debconf priority to have all questions prompted to
30+you when you install software:
31+
32+dpkg-reconfigure debconf
33+
34+Then make sure you select priority medium (by default on Debian systems, the
35+priority is set to high, asking you less things).
36+
37+Because you're on a server environment, it's better not to install the
38+packages that are in the Recommends: of each package:
39+
40+echo "APT { Install-Recommends \"false\"; }" >/etc/apt/apt.conf.d/20norecommends
41+
42+You might also want to receive mail for root, so installing postfix might be
43+a good idea:
44+
45+apt-get install postfix
46+
47+then make sure that /etc/aliases has something like this (not needed if you
48+have changed the debconf priority to medium):
49+
50+root: your-email@example.com
51+
52+and run "newaliases".
53+
54+You can check if sending mail to root forwards to your email address by
55+installing the bsd-mailx package, watching the /var/log/mail.log and using the
56+below command:
57+
58+Mailx root
59+
60+4/ Getting all needed packages installed on your server
61+-------------------------------------------------------
62+You will need to install all nova packages, plus a bit more:
63+apt-get install nova-network nova-compute-xen nova-compute nova-api \
64+ nova-scheduler nova-console glance-api glance-registry python-glance glance \
65+ keystone python-keystoneclient mysql-server rabbitmq-server dnsmasq \
66+ python-software-properties python-mysqldb
67+
68+python-mysqldb is only needed if you wish to use MySQL as SQL server (eg:
69+you could also use postgres if you like, in which case... I don't know!).
70+
71+5. Setting-up the MySQL server and the nova and glance dbs
72+----------------------------------------------------------
73+5.1 MySQL root password
74+- - - - - - - - - - - -
75+Make sure you have changed the default root password for mysql-server. If
76+needed, do dpkg-reconfigure mysql-server-5.1 to set the password after the
77+MySQL server is installed.
78+
79+5.2 Listening on all IPs
80+- - - - - - - - - - - -
81+If you wish to setup nova components using a remote MySQL server (eg not on the
82+domU where nova will run), then you should set your MySQL server to listen on
83+the network. To do so, configure /etc/mysql/my.cnf so that it listen not just
84+on 127.0.0.1 (which is the default in Debian):
85+sed -i "s/127.0.0.1/0.0.0.0/" /etc/mysql/my.cnf
86+
87+Then restart MySQL:
88+invoke-rc.d mysql start
89+
90+5.3 Setting-up glance and nova dbs
91+- - - - - - - - - - - - - - - - -
92+Create the nova and glance dbs:
93+
94+mysql --defaults-file=/etc/mysql/debian.cnf -e \
95+ "CREATE DATABASE nova; CREATE DATABASE glance;"
96+
97+then create the nova and glance users, give them passwords,
98+and access to their respective databases:
99+
100+mysql --defaults-file=/etc/mysql/debian.cnf -e \
101+ "CREATE USER 'nova'@'localhost' IDENTIFIED BY 'change-this-pass';"
102+mysql --defaults-file=/etc/mysql/debian.cnf -e \
103+ "GRANT ALL PRIVILEGES ON nova.* TO 'nova'@'localhost' WITH GRANT OPTION;"
104+mysql --defaults-file=/etc/mysql/debian.cnf -e \
105+ "GRANT ALL PRIVILEGES ON nova.* TO 'nova'@'%' WITH GRANT OPTION;"
106+
107+mysql --defaults-file=/etc/mysql/debian.cnf -e \
108+ "CREATE USER 'glance'@'localhost' IDENTIFIED BY 'change-this-pass';"
109+mysql --defaults-file=/etc/mysql/debian.cnf -e \
110+ "GRANT ALL PRIVILEGES ON glance.* TO 'glance'@'localhost' WITH GRANT OPTION;
111+mysql --defaults-file=/etc/mysql/debian.cnf -e \
112+ "GRANT ALL PRIVILEGES ON glance.* TO 'glance'@'%' WITH GRANT OPTION;
113+
114+The above lines with "localhost" are to grant access only on the local network,
115+the one with % for everything else (take your pick).
116+
117+6/ Configuring Openstack
118+------------------------
119+6.1 Configuration file for nova
120+- - - - - - - - - - - - - - - -
121+In /etc/nova/nova.conf, you will need a configuration file
122+looking like this one:
123+
124+--sql_connection=mysql://nova:change-this-pass@127.0.0.1/nova
125+--rabbit_host=127.0.0.1
126+--network_manager=nova.network.manager.FlatManager
127+--flat_network_bridge=xenbr0
128+--connection_type=xenapi
129+--xenapi_connection_url=https://<ip-of-your-xcp-dom0>
130+--xenapi_connection_username=root
131+--xenapi_connection_password=XXXXXXXXXXXX
132+--reboot_timeout=600
133+--rescue_timeout=86400
134+--resize_confirm_window=86400
135+--allow_admin_api
136+--allow_resize_to_same_host
137+--logdir=/var/log/nova
138+--state_path=/var/lib/nova
139+--lock_path=/var/lock/nova
140+--force_dhcp_release
141+--use_deprecated_auth
142+--use_project_ca
143+--verbose
144+
145+If you decide to install rabbitmq or MySQL on another server, of course, you
146+should set the matching IP address above.
147+
148+Options for --network_manager are:
149+nova.network.manager.FlatManager
150+nova.network.manager.FlatDHCPManager
151+nova.network.manager.VlanManager
152+
153+VLAN networking with DHCP (the 3rd one above) is the Default if no network
154+manager is defined in nova.conf. In this mode, each projects will have its
155+virtual machines isolated in a VLAN. If you don't know, just choose that one.
156+
157+6.2 Getting the dbs in sync with the latest nova and glance
158+- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
159+Make sure all tables and SQL schema are up-to-date with what Nova and
160+glance are using:
161+
162+nova-manage db sync
163+glance-manage db_sync
164+
165+Then restart all nova daemons.
166+
167+7/ Install the XCP nova plugin on the XCP dom0
168+----------------------------------------------
169+XCP has a plugin architecture, and nova implements it. So you need to install
170+the nova plugin for XCP in your dom0 running XenAPI:
171+apt-get install nova-xcp-pluggins
172+
173+XCP is supposed to report a PRODUCT_VERSION, but as of now, this isn't yet
174+ready. So for the moment, you need to do:
175+
176+echo 6.0.0 >/etc/xcp/xapi_version_override
177+
178+and then restart xcp-xapi. (Do not worry too much about this.)
179+
180+8/ Restarting daemons
181+---------------------
182+Restart nova-compute, nova-api, nova-scheduler, nova-objectstore and
183+nova-network and check that they really are started, then check the
184+logs files in /var/log/nova to make sure no daemon crashed and did a
185+python stack dump.
186+
187+Particularly, you should be seeing nova-compute polling XCP every X seconds
188+and ouput something like this:
189+
190+<date> nova...vm_utils [uuid] (VM_UTILS) xenserver vm state -> |Halted|
191+<date> nova...vm_utils [uuid] (VM_UTILS) xenapi power_state -> |4|
192+<date> nova...vm_utils [uuid] (VM_UTILS) xenserver vm state -> |Running|
193+<date> nova...vm_utils [uuid] (VM_UTILS) xenapi power_state -> |1|
194+
195+Note: I have reformated the log output (removed some of it) so that the log
196+line can fit on 80 cols of this text file. This should match more or less what
197+you see on the dom0 when you do "xe vm-list".
198+
199+That's it, you have a working nova installation! Now, let's play with our new
200+cloud computing infrastructure by creating projects, users and VMs.
201+
202+9/ Create a nova user and project
203+---------------------------------
204+In Nova, each user owns projects, and in each projects, you can start virtual
205+machines. So we need to first create a user, attach a project to it, and
206+finally assign a private network to it. Everything is done using the
207+nova-manage userland tool, where you've installed nova. The syntax is like
208+this:
209+nova-manage user create <user_name>
210+nova-manage project create <project_name> <user_name>
211+nova-manage network create <project-network> <num-of-networks-in-proj> \
212+ <addresses-in-each-network>
213+
214+So, let's say I want to have a user "zigo" with project name "proj1",
215+and a simple private network, it goes like this:
216+
217+nova-manage user create zigo
218+nova-manage project create proj1 zigo
219+nova-manage network create 192.168.0.0/24 1 256
220+
221+When you create the new user, you will see the EC2 keys printed on the
222+screen. You don't need to write them down though, we will later on fetch all
223+of these in a convenient .zip file:
224+
225+nova-manage project zipfile proj1 zigo
226+
227+This will save a nova.zip file for the proj1 of zigo. Unzip that file with:
228+unzip nova.zip
229+
230+This will extract the below files:
231+cacert.pem cert.pem novarc pk.pem
232+
233+novarc contains all the script variables needed for you to remote control nova
234+as a user. The above .pem files contain the keys that are referenced by the
235+novarc. Then everything is done with the "nova" command if you want to use the
236+native "nova-client", or with euca-* if you wish to use the EC2 API (the novarc
237+define variables for both).
238+
239+10/ Upload a VM image and start the VM to check everything is working
240+
241+
242+
243+6/ Generate the Openstack CA
244+
245+<FIX ME: insert here how to do that>
246+
247+ -- Thomas Goirand <zigo@debian.org> Wed, 28 Dec 2011 12:19:41 +0000
248
249=== removed file 'debian/api-paste.ini'
250--- debian/api-paste.ini 2011-09-22 17:03:02 +0000
251+++ debian/api-paste.ini 1970-01-01 00:00:00 +0000
252@@ -1,114 +0,0 @@
253-#######
254-# EC2 #
255-#######
256-
257-[composite:ec2]
258-use = egg:Paste#urlmap
259-/: ec2versions
260-/services/Cloud: ec2cloud
261-/services/Admin: ec2admin
262-/latest: ec2metadata
263-/2007-01-19: ec2metadata
264-/2007-03-01: ec2metadata
265-/2007-08-29: ec2metadata
266-/2007-10-10: ec2metadata
267-/2007-12-15: ec2metadata
268-/2008-02-01: ec2metadata
269-/2008-09-01: ec2metadata
270-/2009-04-04: ec2metadata
271-/1.0: ec2metadata
272-
273-[pipeline:ec2cloud]
274-# pipeline = logrequest ec2noauth cloudrequest authorizer ec2executor
275-# NOTE(vish): use the following pipeline for deprecated auth
276-pipeline = logrequest authenticate cloudrequest authorizer ec2executor
277-
278-[pipeline:ec2admin]
279-# pipeline = logrequest ec2noauth adminrequest authorizer ec2executor
280-# NOTE(vish): use the following pipeline for deprecated auth
281-pipeline = logrequest authenticate adminrequest authorizer ec2executor
282-
283-[pipeline:ec2metadata]
284-pipeline = logrequest ec2md
285-
286-[pipeline:ec2versions]
287-pipeline = logrequest ec2ver
288-
289-[filter:logrequest]
290-paste.filter_factory = nova.api.ec2:RequestLogging.factory
291-
292-[filter:ec2lockout]
293-paste.filter_factory = nova.api.ec2:Lockout.factory
294-
295-[filter:ec2noauth]
296-paste.filter_factory = nova.api.ec2:NoAuth.factory
297-
298-[filter:authenticate]
299-paste.filter_factory = nova.api.ec2:Authenticate.factory
300-
301-[filter:cloudrequest]
302-controller = nova.api.ec2.cloud.CloudController
303-paste.filter_factory = nova.api.ec2:Requestify.factory
304-
305-[filter:adminrequest]
306-controller = nova.api.ec2.admin.AdminController
307-paste.filter_factory = nova.api.ec2:Requestify.factory
308-
309-[filter:authorizer]
310-paste.filter_factory = nova.api.ec2:Authorizer.factory
311-
312-[app:ec2executor]
313-paste.app_factory = nova.api.ec2:Executor.factory
314-
315-[app:ec2ver]
316-paste.app_factory = nova.api.ec2:Versions.factory
317-
318-[app:ec2md]
319-paste.app_factory = nova.api.ec2.metadatarequesthandler:MetadataRequestHandler.factory
320-
321-#############
322-# Openstack #
323-#############
324-
325-[composite:osapi]
326-use = egg:Paste#urlmap
327-/: osversions
328-/v1.0: openstackapi10
329-/v1.1: openstackapi11
330-
331-[pipeline:openstackapi10]
332-# pipeline = faultwrap noauth ratelimit osapiapp10
333-# NOTE(vish): use the following pipeline for deprecated auth
334-pipeline = faultwrap auth ratelimit osapiapp10
335-
336-[pipeline:openstackapi11]
337-# pipeline = faultwrap noauth ratelimit extensions osapiapp11
338-# NOTE(vish): use the following pipeline for deprecated auth
339-pipeline = faultwrap auth ratelimit extensions osapiapp11
340-
341-[filter:faultwrap]
342-paste.filter_factory = nova.api.openstack:FaultWrapper.factory
343-
344-[filter:auth]
345-paste.filter_factory = nova.api.openstack.auth:AuthMiddleware.factory
346-
347-[filter:noauth]
348-paste.filter_factory = nova.api.openstack.auth:NoAuthMiddleware.factory
349-
350-[filter:ratelimit]
351-paste.filter_factory = nova.api.openstack.limits:RateLimitingMiddleware.factory
352-
353-[filter:extensions]
354-paste.filter_factory = nova.api.openstack.extensions:ExtensionMiddleware.factory
355-
356-[app:osapiapp10]
357-paste.app_factory = nova.api.openstack:APIRouterV10.factory
358-
359-[app:osapiapp11]
360-paste.app_factory = nova.api.openstack:APIRouterV11.factory
361-
362-[pipeline:osversions]
363-pipeline = faultwrap osversionapp
364-
365-[app:osversionapp]
366-paste.app_factory = nova.api.openstack.versions:Versions.factory
367
368=== modified file 'debian/changelog'
369--- debian/changelog 2012-02-07 17:00:03 +0000
370+++ debian/changelog 2012-05-25 10:20:02 +0000
371@@ -1,3 +1,4 @@
372+<<<<<<< TREE
373 nova (2011.3.1-0ubuntu1) UNRELEASED; urgency=low
374
375 * New upstrem release:
376@@ -107,6 +108,547 @@
377 - CVE-2011-XXXX
378
379 -- Jamie Strandboge <jamie@ubuntu.com> Tue, 25 Oct 2011 08:57:02 -0500
380+=======
381+nova (2012.1~20120518.13585-0ubuntu1) UNRELEASED; urgency=low
382+
383+ * Snapshot of upstream stable/essex branch.
384+ * Remove local copies of upstream patch set as upstream is nice
385+ enough to publish tarballs with everything included.
386+
387+ -- Soren Hansen <soren@ubuntu.com> Fri, 25 May 2012 11:56:44 +0200
388+
389+nova (2012.1-0ubuntu2) precise; urgency=low
390+
391+ [ Adam Gandelman ]
392+ * debian/rules: Properly create empty doc/build/man dir for builds that
393+ skip doc building
394+ * debian/control: Set 'Conflicts: nova-compute-hypervisor' for the various
395+ nova-compute-$type packages. (LP: #975616)
396+ * debian/control: Set 'Breaks: nova-api' for the various nova-api-$service
397+ sub-packages. (LP: #966115)
398+
399+ [ Chuck Short ]
400+ * Resynchronize with stable/essex:
401+ - b1d11b8 Use project_id in ec2.cloud._format_image()
402+ - 6e988ed Fixes image publication using deprecated auth. (LP: #977765)
403+ - 6e988ed Populate image properties with project_id again
404+ - 3b14c74 Fixed bug 962840, added a test case.
405+ - d4e96fe Allow unprivileged RADOS users to access rbd volumes.
406+ - 4acfab6 Stop libvirt test from deleting instances dir
407+ - 155c7b2 fix bug where nova ignores glance host in imageref
408+ * debian/nova.conf: Enabled ec2_private_dns_show_ip so that juju can
409+ connect to openstack instances.
410+ * debian/patches/fix-docs-build-without-network.patch: Fix docs build
411+ when there is no network access.
412+
413+ -- Chuck Short <zulcss@ubuntu.com> Thu, 12 Apr 2012 14:14:29 -0400
414+
415+nova (2012.1-0ubuntu1) precise; urgency=low
416+
417+ * New upstream release.
418+
419+ -- Chuck Short <zulcss@ubuntu.com> Thu, 05 Apr 2012 11:00:38 -0400
420+
421+nova (2012.1~rc4-0ubuntu1) precise; urgency=low
422+
423+ * New upstream release.
424+ * debian/patches/nova-console-monitor.patch: Disabled.
425+ * debian/nova.conf: Removed console-monitor option.
426+
427+ -- Chuck Short <zulcss@ubuntu.com> Wed, 04 Apr 2012 16:55:52 -0400
428+
429+nova (2012.1~rc3-0ubuntu1) precise; urgency=low
430+
431+ * New Upstream release.
432+ * debian/control: Conflict nova-vncproxy with novnc.
433+
434+ -- Chuck Short <zulcss@ubuntu.com> Wed, 04 Apr 2012 09:25:14 -0400
435+
436+nova (2012.1~rc2-0ubuntu1) precise; urgency=low
437+
438+ [ Adam Gandelman ]
439+ * debian/control: Remove unncessary nova-cert dependency from nova-api.
440+ (LP: #965356)
441+ * debian/nova-common.postinst: Clean up spacing, remove redundant chown,
442+ set blanket 0700 nova.nova permissions on /etc/nova/
443+ * debian/nova-compute-{kvm, lxc, uml, xen}.postinst: Set proper permissions
444+ on /etc/nova/nova-compute.conf (LP: #861459)
445+ * debian/nova-common.postinst: Ensure default nova.sqlite database is not
446+ world-readable.
447+ * debian/{rules, nova-common.{install, postinst}}: Install api-paste.ini 0600
448+ with nova-common (in prepartion for proper nova-api-* package separation)
449+ * debian/{nova-common.nova-manage.logrotate,
450+ nova-network.nova-dhcpbridge.logrotate, rules}: Add lograte files,
451+ override_dh_installlogrotate. (LP: #942646)
452+ * Add manpage stubs for nova-api-ec2, nova-api-metadata,
453+ nova-api-os-{volume, compute}, nova-rootwrap. Use sphinx built manpage
454+ for nova-manage (nova-common.manpages)
455+ * debian/nova-compute-{kvm, xen, uml, qemu}.postinst: Remove calls to
456+ adduser since this is already handled from nova-compute.postsinst in a
457+ vendor neutral way. Silences lintian errors regarding adduser dependency
458+
459+ [ Chuck Short ]
460+ * New upstream version.
461+ * debian/patches/libvirt-use-console-pipe.patch: Dropped.
462+ * debian/patches/nova-console-monitor.patch: Add console-monitor
463+ option.
464+ * debian/nova.conf: Enable use_console_monitor
465+ * debian/patches/fix-ubuntu-tests.patch: Fix nova testsuite.
466+ * debian/rules: fail package build if testsuite fails.
467+ * debian/patches/validate_server_name_length.patch: Dropped no longer
468+ needed.
469+ * debian/patches/fix-docs-build-without-network.patch: Some docs need
470+ a network connection in order to build. Disable fetching docs from
471+ the internet.
472+ * debian/patches/0001-fix-useexisting-deprecation-warnings.patch:
473+ Remove deprecated warnings with sqlalchemy.
474+
475+ [ Tyler Hicks ]
476+ * SECURITY UPDATE: Denial of service via resource exhaustion in nova-api
477+ (LP: #968411)
478+ - debian/patches/validate_server_name_length.patch: Limit server names
479+ to a maximum of 255 characters to prevent nova-api log files from
480+ exhausting storage space. Based on upstream patch.
481+ - CVE-2012-1585
482+
483+ -- Chuck Short <zulcss@ubuntu.com> Mon, 02 Apr 2012 11:17:33 -0400
484+
485+nova (2012.1~rc1-0ubuntu2) precise; urgency=low
486+
487+ * debian/control: Add Breaks/Replaces to nova-consoleauth, update
488+ description, nova-console Recommends nova-consoleauth
489+ * debian/nova-console.install: Remove nova-consoleauth
490+
491+ -- Adam Gandelman <adamg@canonical.com> Thu, 22 Mar 2012 11:31:35 -0700
492+
493+nova (2012.1~rc1-0ubuntu1) precise; urgency=low
494+
495+ [ Adam Gandelman ]
496+ [Chuck Short]
497+ * New upstream release.
498+ * debian/patches/libvirt-use-console-pipe.patch: Refreshed
499+
500+ [Adam Gandelman]
501+ * debian/patches/libvirt-console.patch: Refresh
502+ * debian/control: Split nova-consoleauth from nova-console into its own pkg
503+ (LP: #959289)
504+ * debian/nova-console.upstart.in: Specify shell
505+
506+ -- Chuck Short <zulcss@ubuntu.com> Tue, 20 Mar 2012 11:06:11 -0400
507+
508+nova (2012.1~rc1~20120316.13416-0ubuntu1) precise; urgency=low
509+
510+ [Adam Gandelman]
511+ * New upstream release.
512+ * debian/patches/libvirt-conosle-patch: Refresh
513+ * debian/control: Fix descriptions of nova-{doc, cert} (LP: #942541)
514+
515+ [Paul Belanger]
516+ * debian/control: python-nova depends on openssh-client (LP: #956177)
517+
518+ -- Adam Gandelman <adamg@canonical.com> Mon, 12 Mar 2012 12:09:45 -0700
519+
520+nova (2012.1~rc1~20120309.13261-0ubuntu1) precise; urgency=low
521+
522+ [ Chuck Short ]
523+ * New upstream release.
524+ * Refreshed libvirt-console-patch again.
525+
526+ [ Adam Gandleman ]
527+ * debian/patches/{ec2-fixes.patch, libvirt-console-pipe.patch}: Fix and
528+ refresh. Add dep3 headers from original git commits.
529+ * debian/patches/ec2-fixes.patch: Dropped. Merge upstream at 121537c3
530+ * debain/{rules, nova-docs.doc}: Docs now built in doc/build/.
531+ * debian/patches/libvirt-use-console-pipe.patch: Update use of
532+ instance['name'] instead of instance_name
533+
534+ -- Chuck Short <zulcss@ubuntu.com> Fri, 09 Mar 2012 13:07:19 -0500
535+
536+nova (2012.1~e4-0ubuntu1) precise; urgency=low
537+
538+ [ Adam Gandleman ]
539+ * debian/patches/libvirt-use-console-pipe.patch: Refreshed.
540+ * debain/nova-volume.upstart.in: Ensure lock directory is created
541+ (LP: #940780)
542+ * debain/control: Fix nova-compute-$flavor Depends
543+ * debian/control: Add python-iso8601 to python-nova Depends
544+
545+ [ Chuck Short ]
546+ * debian/rules: Fix FTBFS.
547+ * Merge Ubuntu/Debian packaging:
548+ - Thanks to Julien Danjou, Ghe Rivero, and Thomas Goirand
549+ - debian/copyright: Update copyright file.
550+ - debian/nova-api.init, debian/nova-compute.init,
551+ debian/nova-network.init, debian/nova-objectstore,
552+ debian/nova-scheduler, debian/nova-volume.init:
553+ Synchronize init scripts.
554+ - nova-common.install, debian/rules: Install policy.json
555+ - debian/rules, debian/nova-xcp-network.install,
556+ debian/nova-xcp-plugins.install, nova-xcp-plugins.postrm,
557+ debian/nova-xcp-plugins.doc, debian/nova-xcp-plugins.postinst,
558+ debian/README.xcp_and_openstack, debian/control,
559+ debian/ubuntu_xen-openvswitch-nova.rules,
560+ debian/patches/path-to-the-xenhost.conf-fixup.patch:
561+ Add Xen XCP support.
562+ - debian/control,
563+ debian/nova-compute-{kvm,lxc,qemu,xen,uml}.postinst: Make
564+ nova-compute a virtual package.
565+ - Dropped ubuntu_ubuntu_control_vars: We dont use it
566+ * New upstream release.
567+ * Dropped python-babel, it will be handled by langpacks.
568+ * debian/patches/ec2-fixes.patch: Backport turnk fix for ec2
569+ permissions.
570+ * debian/patches/path-to-the-xenhost.conf-fixup.patch: Refreshed.
571+
572+ -- Chuck Short <zulcss@ubuntu.com> Fri, 02 Mar 2012 11:18:35 -0500
573+
574+nova (2012.1~e4~20120224.12913-0ubuntu1) precise; urgency=low
575+
576+ [ Monty Taylor ]
577+ * Move files from nova/locale to /usr/share/locale
578+
579+ [ Chuck Short ]
580+ * debian/rules: Fix FTBFS.
581+ * debian/control: Add depends on python-babel.
582+ * debian/control: Add depends on python-iso8601.
583+ * debian/nova-api-os-volume.install: Fix FTBS.
584+ * debian/patches/libvirt-use-console-pipe.patch: Refreshed and
585+ Re-enabled. (LP: #879666)
586+ * debian/control: Make sure we install nova-cert
587+
588+ [ Joseph Heck ]
589+ * debian/nova-console.install: Add nova-consoleauth.
590+ * Add nova-api-ec2, nova-api-os-compute, and nova-api-os-volume.
591+
592+ -- Chuck Short <zulcss@ubuntu.com> Fri, 24 Feb 2012 10:08:10 -0500
593+
594+nova (2012.1~e4~20120217.12709-0ubuntu1) precise; urgency=low
595+
596+ [ Dave Walker (Daviey) ]
597+ * New upstream snapshot
598+ * debian/patches/temp_fix_linux_net.patch:
599+ - Dropped, applied upstream. LP: #929127
600+ * debian/patches/libvirt-use-console-pipe.patch:
601+ - Rebased against latest trunk
602+
603+ [ Chuck Short ]
604+ * debian/nova.conf: Re-enable default iscsi_helper.
605+ * debian/nova.conf: More fixups.
606+ * debian/control: Dont depend and conflicts on nova-compute-
607+ hypervisor. (LP: #923681)
608+ * debian/patches/libvirt-us-console-pipe.patch: Refreshed.
609+ * Temporarily disable console patch. (LP: #932787)
610+ * New usptream version.
611+
612+ -- Chuck Short <zulcss@ubuntu.com> Fri, 17 Feb 2012 11:02:12 -0500
613+
614+nova (2012.1~e4~20120210.12574-0ubuntu1) precise; urgency=low
615+
616+ [Chuck Short]
617+ * New upstream release.
618+ * debian/patches/nova-manage_flagfile_location.patch:
619+ Refreshed patch.
620+ * debian/patches/libvirt-use-console-pipe.patch:
621+ Re-add from oneiric.
622+ * Dropped debian/patches/packaged-ajaxterm-calls.patch.
623+ * debian/control:
624+ - Dropped recommends on ajaxterm for nova-compute
625+ - Dropped nova-ajaxterm package.
626+
627+ [Adam Gandleman]
628+ * debian/patches/temp_fix_linux_net.patch: Temporary patch until LP:
629+ 929127 is resolved.
630+
631+ -- Chuck Short <zulcss@ubuntu.com> Fri, 10 Feb 2012 11:25:38 -0500
632+
633+nova (2012.1~e4~20120208.12523-0ubuntu1) UNRELEASED; urgency=low
634+
635+ [ Chuck Short ]
636+ * debian/patches/fix-nova-rootwraper-env.patch: Dropped
637+ no longer needed.
638+ * debian/nova-compute-{kvm,xen,uml,lxc}.conf: Add the connection
639+ type "--connection=libvirt" since libvirt is no longer the default.
640+
641+ [ Adam Gandelman ]
642+ * debian/nova.conf: Define connection_type=libvirt in common nova.conf
643+ instead of nova-compute-*.conf until Bug #921294 is addressed.
644+
645+ [ Vish Ishaya ]
646+ * debian/mans/nova-cert.8, debian/nova-cert.init, debian/nova-cert.install,
647+ debian/nova-cert.logrotate, debian/nova-cert.manpages,
648+ debian/nova-cert.upstart.in, debian/control, debian/source_nova.py:
649+ Add nova-cert.
650+
651+ [ Soren Hansen ]
652+ * Refresh flagfile location patch.
653+ * Enable builds on versions of Ubuntu that do not have dh_python2.
654+ * Remove ajaxterm patch (upstream performed a ajaxtermectomy)
655+ * Replace ajax console proxy package with an empty, transitional
656+ package.
657+ * Add a nova-compute-qemu package.
658+
659+ -- Soren Hansen <soren@ubuntu.com> Fri, 10 Feb 2012 17:41:50 +0100
660+
661+nova (2012.1~e4~20120203.12454-0ubuntu1) precise; urgency=low
662+
663+ [Chuck Short]
664+ * New upstream version.
665+ * debian/control: Replace m2crpto with python-crypto.
666+ (LP: #917851)
667+ * debian/*.upstart.in, debian/nova-common.postinst,
668+ debian/nova_sudoers: Change default shell to /bin/false.
669+ (LP: #890362)
670+
671+ [Adam Gandleman]
672+ * debian/nova-common.{install, postinst}: Install policy.json on all
673+ Nova nodes (LP: #923817)
674+ * debian/rules: Remove installation of policy.json (moved to nova-common),
675+ point to the correct upstream git repository.
676+
677+ -- Chuck Short <zulcss@ubuntu.com> Fri, 03 Feb 2012 09:03:12 -0500
678+
679+nova (2012.1~e3-0ubuntu1) precise; urgency=low
680+
681+ [Chuck short]
682+ * New upstream release.
683+ * debian/patches/fix-nova-rootwraper-env.patch: Dropped
684+ no longer needed.
685+ * debian/nova-compute-{kvm,xen,uml,lxc}.conf: Add the connection
686+ type "--connection=libvirt" since libvirt is no longer the default.
687+
688+ [Adam Gandelman]
689+ * debian/nova.conf: Define connection_type=libvirt in common nova.conf
690+ instead of nova-compute-*.conf until Bug #921294 is addressed.
691+
692+ [Vish Ishaya]
693+ * debian/mans/nova-cert.8, debian/nova-cert.init, debian/nova-cert.install,
694+ debian/nova-cert.logrotate, debian/nova-cert.manpages,
695+ debian/nova-cert.upstart.in, debian/control, debian/source_nova.py:
696+ Add nova-cert.
697+
698+ -- Chuck Short <zulcss@ubuntu.com> Thu, 26 Jan 2012 10:29:13 -0500
699+
700+nova (2012.1~e3~20120120.12170-0ubuntu1) precise; urgency=low
701+
702+ [Chuck Short]
703+ * New upstream version.
704+ * debian/nova-vncproxy.install, debian/nova-vncproxy.upstart.in:
705+ nova-vncproxy becomes nova-xvpvncproxy.
706+ * debian/nova.conf: Really use the nova rootwrapper. (LP: #918179)
707+ * debian/nova_sudoers: Fix typo in rootwrap usage.
708+ * debian/patches/kombu_tests_timeout.patch: Skip
709+ "test_iterconsume_errors_will_reconnect" test.
710+
711+ [Dan Prince]
712+ * Add policy.json to packages.
713+
714+ [Thierry Carrez]
715+ * debian/*.pyinstall: Ship filter files in each node... (LP: #919105)
716+ * debian/python-nova.pyremove: ...and no longer in python-nova (LP: #919105)
717+ * debian/patches/fix-nova-rootwraper-env.patch: Fix temporary issue with
718+ nova-rootwrap and nova-compute.
719+
720+ -- Chuck Short <zulcss@ubuntu.com> Fri, 20 Jan 2012 11:54:15 -0500
721+
722+nova (2012.1~e3~20120113.12049-0ubuntu1) precise; urgency=low
723+
724+ [ Chuck Short ]
725+ * New upstream version.
726+ * debian/nova_sudoers, debian/nova-common.install,
727+ Switch out to nova-rootwrap. (LP: #681774)
728+ * Add "get-origsource-git" which allows developers to
729+ generate a tarball from github, by doing:
730+ fakeroot debian/rules get-orig-source-git
731+ * debian/debian/nova-objectstore.logrotate: Dont determine
732+ if we are running Debian or Ubuntu. (LP: #91379)
733+
734+ [ Adam Gandleman ]
735+ * Removed python-nova.postinst, let dh_python2 generate instead since
736+ python-support is not a dependency. (LP: #907543)
737+
738+ -- Chuck Short <zulcss@ubuntu.com> Fri, 13 Jan 2012 09:51:10 +0100
739+
740+nova (2012.1~e2-0ubuntu4) precise; urgency=low
741+
742+ * SECURITY UPDATE: fix tenant bypass by authenticated users via OpenStack
743+ API (LP: #904072)
744+ - CVE-2012-XXXX
745+
746+ -- Jamie Strandboge <jamie@ubuntu.com> Thu, 05 Jan 2012 08:58:46 -0600
747+
748+nova (2012.1~e2-0ubuntu2) precise; urgency=low
749+
750+ [ Chuck Short ]
751+ * debian/nova.conf: Fix misconfiguration.
752+
753+ [ Dan Prince ]
754+ * debian/nova_sudoers: Fix typo
755+ * Add policy.json to packages.
756+
757+ -- Thierry Carrez (ttx) <thierry@openstack.org> Thu, 22 Dec 2011 16:15:22 +0100
758+
759+nova (2012.1~e2-0ubuntu1) precise; urgency=low
760+
761+ * New usptream release. Fixes the following bugs:
762+ (LP: #871278, #848643, #859679, #83199)
763+ * debian/nova-console.install: Fix empty package.
764+ * debian/patches, debian/pydist-overrides: Cleaner way
765+ of disabling unwanted python-dependencies.
766+ * debian/control:
767+ - Suggest python-keystone. (LP: #901881)
768+ - Update build dependencies.
769+ * debian/nova.conf: Use virtio networking by default.
770+ (LP: #904480)
771+ * debian/fix-traversal-via-image-register.patch: Dropped
772+ fixed upstream.
773+
774+ -- Chuck Short <zulcss@ubuntu.com> Fri, 16 Dec 2011 13:03:55 -0500
775+
776+nova (2012.1~e2~20111208.11721-0ubuntu3) precise; urgency=low
777+
778+ * SECURITY UPDATE: fix directory traversal during image registration via
779+ EC2 API and S3/RegisterImage
780+ - fix-traversal-via-image-register.patch: adjust nova/image/s3.py to
781+ use basename instead of absolute path
782+ - CVE-2011-4596
783+
784+ -- Jamie Strandboge <jamie@ubuntu.com> Tue, 13 Dec 2011 08:39:13 -0600
785+
786+nova (2012.1~e2~20111208.11721-0ubuntu2) precise; urgency=low
787+
788+ * Disable python-coverage as well.
789+
790+ -- Chuck Short <zulcss@ubuntu.com> Mon, 12 Dec 2011 10:13:04 -0500
791+
792+nova (2012.1~e2~20111208.11721-0ubuntu1) precise; urgency=low
793+
794+ * New upstream release.
795+ * debian/control:
796+ + Add python-suds as a dependency.
797+ * debian/patches: Temporarily disable python-nosexcover.
798+
799+ -- Chuck Short <zulcss@ubuntu.com> Fri, 09 Dec 2011 14:24:07 -0500
800+
801+nova (2012.1~e2~20111202.11641-0ubuntu2) precise; urgency=low
802+
803+ * debian/nova.conf: Remove parameter to --force_dhcp_release
804+ (LP: #891227)
805+
806+ -- Adam Gandelman <adamg@canonical.com> Fri, 02 Dec 2011 11:31:34 -0800
807+
808+nova (2012.1~e2~20111202.11641-0ubuntu1) precise; urgency=low
809+
810+ * New upstream release.
811+ * debian/nova_sudoers: Clean up to remove unused programs
812+ needed by root. (LP: #989583)
813+
814+ -- Chuck Short <zulcss@ubuntu.com> Fri, 02 Dec 2011 10:56:30 -0500
815+
816+nova (2012.1~e2~20111125.11566-0ubuntu1) precise; urgency=low
817+
818+ * New upstream release.
819+ * Refreshed debian/patches/packaged-ajaxterm-calls.patch.
820+
821+ -- Chuck Short <zulcss@ubuntu.com> Fri, 25 Nov 2011 14:02:18 -0500
822+
823+nova (2012.1~e2~20111116.11495-0ubuntu1) precise; urgency=low
824+
825+ * New upstream version.
826+ * Refreshed debian/patches/packaged-ajaxterm-calls.patch.
827+
828+ -- Chuck Short <zulcss@ubuntu.com> Fri, 18 Nov 2011 09:40:58 -0500
829+
830+nova (2012.1~e1-0ubuntu3) precise; urgency=low
831+
832+ * debian/rules: Take the api-paste.ini from nova/etc.
833+
834+ -- Chuck Short <zulcss@ubuntu.com> Thu, 17 Nov 2011 14:10:03 -0500
835+
836+nova (2012.1~e1-0ubuntu2) precise; urgency=low
837+
838+ * Revert debian/nova-manage_flagfile_location.patch: It
839+ was causing more problems then it should have. (LP: #891229)
840+
841+ -- Chuck Short <zulcss@ubuntu.com> Wed, 16 Nov 2011 21:12:34 -0500
842+
843+nova (2012.1~e1-0ubuntu1) precise; urgency=low
844+
845+ * New upstream release.
846+ * debian/control: Dropped python-feedparser until MIR comes through.
847+ * Synced with upstream bzr packaging.
848+
849+ -- Chuck Short <zulcss@ubuntu.com> Fri, 11 Nov 2011 09:25:25 -0500
850+
851+nova (2012.1~e1~20111020.11229-0ubuntu1) precise; urgency=low
852+
853+ * New upstream release.
854+ * Dropped patches, already applied upstream:
855+ - debian/patches/backport-iscsitarget-choice.patch
856+ - debian/patches/backport-libvirt-console-pipe.patch
857+ - debian/patches/backport-lxc-container-console-fix.patch
858+ - debian/patches/backport-recreate-gateway-using-dhcp.patch
859+ - debian/patches/backport-snapshot-cleanup.patch
860+ - debian/patches/block-migration-needs-copy-backingfile.patch
861+ - debian/patches/fix-iscsi-target-path.patch
862+ - debian/patches/fix-lp838581-removed-db_pool-complexities.patch
863+ - debian/patches/fix-lp863305-images-permission.patch
864+ - debian/patches/fqdn-in-local-hostname-of-ec2-metadata.patch
865+ - debian/patches/use-netcat-instead-of-socat.patc
866+ * debian/control:
867+ - Add python-feedparser as a build dependency.
868+ - Bump standards version to 3.9.2
869+ - Point to the essex branch.
870+ * debian/patches/nova-manage_flagfile_location.patch:
871+ Update patch to take in account of devstack (LP: #870405)
872+
873+ -- Chuck Short <zulcss@ubuntu.com> Fri, 21 Oct 2011 14:37:26 -0400
874+
875+nova (2012.1~e1~20110909.1546-0ubuntu0) UNRELEASED; urgency=low
876+
877+ [ Dan Prince ]
878+ * Fix dnsmasq line in nova_sudoers.
879+ * Update ajaxterm patch to work with latest nova code.
880+
881+ [ Monty Taylor ]
882+ * Added python-feedparser to build-deps.
883+ * Added branching logic to allow for building on lucid.
884+ * Indicate depend on pastedeploy 1.5.0, since it's required.
885+
886+ [ Tushar Patil ]
887+ * Added iputils-arping to Depends and arping to sudoers
888+
889+ [Chuck Short]
890+ * Merged ubuntu packaging changes:
891+ - debian/control: Drop socat in favor of netcat.
892+ - debian/nova-compute.upstart.in, debian/nova.conf:
893+ Move reference of nova-compute.conf from nova.conf to
894+ nova-compute's argv.
895+ - debian/nova-common.postinst: Create 'nova' group, add user to it.
896+ - debian/nova-common.postinst: Restrict permissions of /var/log/nova
897+ * Updated debian/patches/packaged-ajaxterm-calls.patch to fix FTBFS.
898+ * Updated debian/patches/nova-manage_flagfile_location.patch
899+ * debian/nova-api.install, debian/rules: Use etc/nova/api-paste.ini.
900+ * debian/nova_sudoers: Clean up sudoers.
901+ * debian/control: Add dependencies.
902+
903+ [ Mark Washenberger ]
904+ * Add support for nova-console package.
905+
906+ -- Monty Taylor <mordred@inaugust.com> Fri, 30 Sep 2011 09:33:16 -0700
907+
908+nova (2011.3-0ubuntu6.1) oneiric-proposed; urgency=low
909+
910+ [Scott Moser]
911+ * Removed db_pool complexities from nova.db.sqlalchemy.session (LP: #838581)
912+
913+ [Chuck Short]
914+ * debian/patches/fix-iscsi-target-path.patch: Fix ISCSI target path patch.
915+ (LP: #871278)
916+ * debian/control: Either install xen-hypervisor-4.1-amd64 or
917+ xen-hypervisor-4.1-i386 for nova-compute-xen. (LP: #873243)
918+
919+ -- Chuck Short <zulcss@ubuntu.com> Wed, 12 Oct 2011 14:33:25 -0400
920+>>>>>>> MERGE-SOURCE
921
922 nova (2011.3-0ubuntu6) oneiric; urgency=low
923
924@@ -243,8 +785,9 @@
925
926 [ Monty Taylor ]
927 * Add branching logic for building on lucid.
928+ * Add vlan as a depend for nova-compute.
929
930- -- Monty Taylor <mordred@inaugust.com> Mon, 19 Sep 2011 17:03:29 -0400
931+ -- Monty Taylor <mordred@inaugust.com> Wed, 21 Sep 2011 17:49:43 -0400
932
933 nova (2011.3~rc~20110909.r1155-0ubuntu1) oneiric; urgency=low
934
935
936=== modified file 'debian/control'
937--- debian/control 2012-02-07 17:00:03 +0000
938+++ debian/control 2012-05-25 10:20:02 +0000
939@@ -5,16 +5,16 @@
940 XSBC-Original-Maintainer: Openstack Maintainers <openstack@lists.launchpad.net>
941 Uploaders: Soren Hansen <soren@ubuntu.com>, Thomas Goirand <zigo@debian.org>
942 Build-Depends: debhelper (>= 7.0.50),
943- python-m2crypto,
944 python-all (>= 2.6),
945- python-all-dev (>= 2.6.6-3~),
946+ python-all-dev (>= 2.6.6-3~) | python-support,
947 Build-Depends-Indep:
948+ openssh-client,
949+ openssl,
950 python-setuptools,
951 python-sphinx (>> 1.0),
952 python-distutils-extra,
953 python-gflags,
954 python-mox,
955- openssl,
956 python-carrot,
957 python-kombu,
958 python-boto,
959@@ -27,7 +27,7 @@
960 python-cheetah,
961 python-nose,
962 python-paste,
963- python-pastedeploy,
964+ python-pastedeploy (>= 1.5.0),
965 python-tempita,
966 python-migrate,
967 python-netaddr,
968@@ -38,18 +38,26 @@
969 python-simplejson,
970 python-lxml,
971 python-unittest2,
972+ python-daemon,
973+ python-suds,
974+ python-xattr,
975+ python-feedparser,
976+ python-crypto,
977+ python-iso8601,
978 pep8
979 Build-Conflicts: python-cjson
980-Standards-Version: 3.9.1
981+Standards-Version: 3.9.2
982 Homepage: http://launchpad.net/nova
983-Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-server-dev/nova/diablo/debian/files
984-Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-server-dev/nova/diablo
985+Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-server-dev/nova/essex/debian/files
986+Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-server-dev/nova/essex
987
988
989 Package: python-nova
990 Architecture: all
991 Section: python
992 Depends: ${python:Depends},
993+ openssh-client,
994+ openssl,
995 python-boto,
996 python-m2crypto,
997 python-pycurl,
998@@ -58,7 +66,6 @@
999 python-kombu,
1000 python-lockfile,
1001 python-gflags,
1002- openssl,
1003 python-libxml2,
1004 python-ldap,
1005 python-sqlalchemy-ext | python-sqlalchemy (<< 0.6.3-2),
1006@@ -76,6 +83,11 @@
1007 python-novaclient,
1008 python-simplejson,
1009 python-lxml,
1010+ python-feedparser,
1011+ python-xattr,
1012+ python-daemon,
1013+ python-suds,
1014+ python-iso8601,
1015 sudo,
1016 ${misc:Depends}
1017 Suggests: python-suds (>= 0.4.0),
1018@@ -104,6 +116,7 @@
1019 Architecture: all
1020 Depends: python-amqplib, python-nova (= ${binary:Version}), ${python:Depends}, ${misc:Depends}, adduser
1021 Provides: ${python:Provides}
1022+Suggests: python-keystone
1023 Description: OpenStack Compute - common files
1024 OpenStack is a reliable cloud infrastructure. Its mission is to produce
1025 the ubiquitous cloud computing platform that will meet the needs of public
1026@@ -123,9 +136,9 @@
1027
1028 Package: nova-compute
1029 Architecture: all
1030-Depends: ${ostack-lsb-base}, ${nova-compute-deps}, nova-common (= ${binary:Version}), kpartx, curl, parted, vlan, ebtables, gawk, iptables, open-iscsi, ${nova-compute-default-hypervisor} | nova-compute-hypervisor,
1031+Depends: lsb-base (>= 3.0.6), nova-common (= ${binary:Version}), qemu-utils, kpartx, curl, parted, vlan,
1032+ ebtables, gawk, iptables, open-iscsi, nova-compute-kvm | nova-compute-hypervisor,
1033 ${python:Depends}, ${misc:Depends}
1034-Recommends: ajaxterm
1035 Description: OpenStack Compute - compute node
1036 OpenStack is a reliable cloud infrastructure. Its mission is to produce
1037 the ubiquitous cloud computing platform that will meet the needs of public
1038@@ -148,7 +161,6 @@
1039 Architecture: all
1040 Depends: nova-compute (= ${binary:Version}), python-libvirt, libvirt-bin, ${misc:Depends}
1041 Provides: nova-compute-hypervisor
1042-Replaces: nova-compute-hypervisor
1043 Conflicts: nova-compute-hypervisor
1044 Description: OpenStack Compute - compute node (LXC)
1045 OpenStack is a reliable cloud infrastructure. Its mission is to produce
1046@@ -171,7 +183,6 @@
1047 Architecture: all
1048 Depends: nova-compute (= ${binary:Version}), python-libvirt, libvirt-bin, user-mode-linux, ${misc:Depends}
1049 Provides: nova-compute-hypervisor
1050-Replaces: nova-compute-hypervisor
1051 Conflicts: nova-compute-hypervisor
1052 Description: OpenStack Compute - compute node (UserModeLinux)
1053 OpenStack is a reliable cloud infrastructure. Its mission is to produce
1054@@ -194,7 +205,6 @@
1055 Architecture: all
1056 Depends: nova-compute (= ${binary:Version}), python-libvirt, libvirt-bin, xen-hypervisor-4.1-amd64 | xen-hypervisor-4.1-i386,, ${misc:Depends}
1057 Provides: nova-compute-hypervisor
1058-Replaces: nova-compute-hypervisor
1059 Conflicts: nova-compute-hypervisor
1060 Description: OpenStack Compute - compute node (Xen)
1061 OpenStack is a reliable cloud infrastructure. Its mission is to produce
1062@@ -213,11 +223,32 @@
1063 .
1064 Install this package on your compute nodes if you're using Xen.
1065
1066+Package: nova-compute-qemu
1067+Architecture: all
1068+Depends: nova-compute (= ${binary:Version}), python-libvirt, libvirt-bin, qemu, ${misc:Depends}
1069+Provides: nova-compute-hypervisor
1070+Conflicts: nova-compute-hypervisor
1071+Description: OpenStack Compute - compute node (QEmu)
1072+ OpenStack is a reliable cloud infrastructure. Its mission is to produce
1073+ the ubiquitous cloud computing platform that will meet the needs of public
1074+ and private cloud providers regardless of size, by being simple to implement
1075+ and massively scalable.
1076+ .
1077+ OpenStack Compute, codenamed Nova, is a cloud computing fabric controller. In
1078+ addition to its "native" API (the OpenStack API), it also supports the Amazon
1079+ EC2 API.
1080+ .
1081+ Nova is intended to be modular and easy to extend and adapt. It supports many
1082+ different hypervisors (KVM and Xen to name a few), different database backends
1083+ (SQLite, MySQL, and PostgreSQL, for instance), different types of user
1084+ databases (LDAP or SQL), etc.
1085+ .
1086+ Install this package on your compute nodes if you're using QEmu.
1087+
1088 Package: nova-compute-kvm
1089 Architecture: all
1090 Depends: nova-compute (= ${binary:Version}), python-libvirt, libvirt-bin, kvm, ${misc:Depends}
1091 Provides: nova-compute-hypervisor
1092-Replaces: nova-compute-hypervisor
1093 Conflicts: nova-compute-hypervisor
1094 Description: OpenStack Compute - compute node (KVM)
1095 OpenStack is a reliable cloud infrastructure. Its mission is to produce
1096@@ -236,6 +267,94 @@
1097 .
1098 Install this package on your compute nodes if you're using kvm.
1099
1100+Package: nova-compute-xcp
1101+Architecture: all
1102+Depends: nova-compute (= ${binary:Version}), python-xenapi, ${misc:Depends}
1103+Provides: nova-compute-hypervisor
1104+Conflicts: nova-compute-hypervisor
1105+Description: OpenStack Compute - compute node (XCP)
1106+ OpenStack is a reliable cloud infrastructure. Its mission is to produce
1107+ the ubiquitous cloud computing platform that will meet the needs of public
1108+ and private cloud providers regardless of size, by being simple to implement
1109+ and massively scalable.
1110+ .
1111+ OpenStack Compute, codenamed Nova, is a cloud computing fabric controller. In
1112+ addition to its "native" API (the OpenStack API), it also supports the Amazon
1113+ EC2 API.
1114+ .
1115+ Nova is intended to be modular and easy to extend and adapt. It supports many
1116+ different hypervisors (KVM and Xen to name a few), different database backends
1117+ (SQLite, MySQL, and PostgreSQL, for instance), different types of user
1118+ databases (LDAP or SQL), etc.
1119+ .
1120+ Install this package on your compute nodes if you're using xcp
1121+
1122+Package: nova-xcp-plugins
1123+Architecture: all
1124+Depends: xcp-xapi, ${python:Depends}, ${misc:Depends}
1125+Description: OpenStack Compute plugin for the Xen Cloud Platform
1126+ OpenStack is a reliable cloud infrastructure. Its mission is to produce
1127+ the ubiquitous cloud computing platform that will meet the needs of public
1128+ and private cloud providers regardless of size, by being simple to implement
1129+ and massively scalable.
1130+ .
1131+ OpenStack Compute, codenamed Nova, is a cloud computing fabric controller. In
1132+ addition to its "native" API (the OpenStack API), it also supports the Amazon
1133+ EC2 API.
1134+ .
1135+ Nova is intended to be modular and easy to extend and adapt. It supports many
1136+ different hypervisors (KVM and Xen to name a few), different database backends
1137+ (SQLite, MySQL, and PostgreSQL, for instance), different types of user
1138+ databases (LDAP or SQL), etc.
1139+ .
1140+ This package is to be installed on the server where you have installed your
1141+ master Xen API server (see the xcp-xapi package), so that nova-compute can
1142+ remotely control your XCP nodes and start VM instances.
1143+
1144+Package: nova-xcp-network
1145+Architecture: all
1146+Depends: xcp-xapi, lsb-base (>= 3.0.6), ${python:Depends}, ${misc:Depends}, nova-xcp-plugins (= ${binary:Version}),
1147+ openvswitch-switch, ebtables, arptables, iproute
1148+Description: OpenStack Compute network plugin for the Xen Cloud Platform
1149+ OpenStack is a reliable cloud infrastructure. Its mission is to produce
1150+ the ubiquitous cloud computing platform that will meet the needs of public
1151+ and private cloud providers regardless of size, by being simple to implement
1152+ and massively scalable.
1153+ .
1154+ OpenStack Compute, codenamed Nova, is a cloud computing fabric controller. In
1155+ addition to its "native" API (the OpenStack API), it also supports the Amazon
1156+ EC2 API.
1157+ .
1158+ Nova is intended to be modular and easy to extend and adapt. It supports many
1159+ different hypervisors (KVM and Xen to name a few), different database backends
1160+ (SQLite, MySQL, and PostgreSQL, for instance), different types of user
1161+ databases (LDAP or SQL), etc.
1162+ .
1163+ This package is to be installed on the server where you have installed your
1164+ master Xen API server (see the xcp-xapi package), so that nova can remotely
1165+ configure the network of your XCP servers.
1166+
1167+
1168+Package: nova-cert
1169+Architecture: all
1170+Depends: ${ostack-lsb-base}, nova-common (= ${binary:Version}), ${python:Depends}, ${misc:Depends}
1171+Description: OpenStack Compute - certificate management
1172+ OpenStack is a reliable cloud infrastructure. Its mission is to produce
1173+ the ubiquitous cloud computing platform that will meet the needs of public
1174+ and private cloud providers regardless of size, by being simple to implement
1175+ and massively scalable.
1176+ .
1177+ OpenStack Compute, codenamed Nova, is a cloud computing fabric controller. In
1178+ addition to its "native" API (the OpenStack API), it also supports the Amazon
1179+ EC2 API.
1180+ .
1181+ Nova is intended to be modular and easy to extend and adapt. It supports many
1182+ different hypervisors (KVM and Xen to name a few), different database backends
1183+ (SQLite, MySQL, and PostgreSQL, for instance), different types of user
1184+ databases (LDAP or SQL), etc.
1185+ .
1186+ This is the Nova certificate management component.
1187+
1188 Package: nova-scheduler
1189 Architecture: all
1190 Depends: ${ostack-lsb-base}, nova-common (= ${binary:Version}), ${python:Depends}, ${misc:Depends}
1191@@ -279,8 +398,7 @@
1192
1193 Package: nova-ajax-console-proxy
1194 Architecture: all
1195-Depends: ${ostack-lsb-base}, nova-common (= ${binary:Version}), ${python:Depends}, ${misc:Depends}
1196-Description: OpenStack Compute - AJAX console proxy
1197+Description: OpenStack Compute - AJAX console proxy - transitional package
1198 OpenStack is a reliable cloud infrastructure. Its mission is to produce
1199 the ubiquitous cloud computing platform that will meet the needs of public
1200 and private cloud providers regardless of size, by being simple to implement
1201@@ -295,13 +413,12 @@
1202 (SQLite, MySQL, and PostgreSQL, for instance), different types of user
1203 databases (LDAP or SQL), etc.
1204 .
1205- This package provides the AJAX proxy. It is a publically reachable
1206- component which proxies access to ajaxterm's running on compute
1207- nodes.
1208+ This package used to provide the AJAX proxy, which is now gone.
1209
1210 Package: nova-vncproxy
1211 Architecture: all
1212 Depends: ${ostack-lsb-base}, nova-common (= ${binary:Version}), ${python:Depends}, ${misc:Depends}
1213+Conflicts: novnc
1214 Description: OpenStack Compute - VNC proxy
1215 OpenStack is a reliable cloud infrastructure. Its mission is to produce
1216 the ubiquitous cloud computing platform that will meet the needs of public
1217@@ -386,12 +503,59 @@
1218 This is the package contains a very simple S3-like object store.
1219 For production use, you should use OpenStack Storage, aka. Swift.
1220
1221+Package: nova-console
1222+Architecture: all
1223+Depends: ${ostack-lsb-base}, nova-common (= ${binary:Version}), ${python:Depends}, ${misc:Depends}
1224+Recommends: nova-consoleauth (>= 2012.1~rc1-0ubuntu2)
1225+Description: OpenStack Compute - Console
1226+ OpenStack is a reliable cloud infrastructure. Its mission is to produce
1227+ the ubiquitous cloud computing platform that will meet the needs of public
1228+ and private cloud providers regardless of size, by being simple to implement
1229+ and massively scalable.
1230+ .
1231+ OpenStack Compute, codenamed Nova, is a cloud computing fabric controller. In
1232+ addition to its "native" API (the OpenStack API), it also supports the Amazon
1233+ EC2 API.
1234+ .
1235+ Nova is intended to be modular and easy to extend and adapt. It supports many
1236+ different hypervisors (KVM and Xen to name a few), different database backends
1237+ (SQLite, MySQL, and PostgreSQL, for instance), different types of user
1238+ databases (LDAP or SQL), etc.
1239+ .
1240+ This package provides the console server. This enables the use of consoles
1241+ to be used along with XVP and XenServer. It is a publically reachable
1242+ component which proxies access to VNCs running on compute nodes.
1243+
1244+Package: nova-consoleauth
1245+Architecture: all
1246+Depends: ${ostack-lsb-base}, nova-common (= ${binary:Version}), ${python:Depends}, ${misc:Depends}
1247+Breaks: nova-console (<< 2012.1~rc1-0ubuntu2)
1248+Replaces: nova-console (<< 2012.1~rc1-0ubuntu2)
1249+Description: OpenStack Compute - Console Authenticator
1250+ OpenStack is a reliable cloud infrastructure. Its mission is to produce
1251+ the ubiquitous cloud computing platform that will meet the needs of public
1252+ and private cloud providers regardless of size, by being simple to implement
1253+ and massively scalable.
1254+ .
1255+ OpenStack Compute, codenamed Nova, is a cloud computing fabric controller. In
1256+ addition to its "native" API (the OpenStack API), it also supports the Amazon
1257+ EC2 API.
1258+ .
1259+ Nova is intended to be modular and easy to extend and adapt. It supports many
1260+ different hypervisors (KVM and Xen to name a few), different database backends
1261+ (SQLite, MySQL, and PostgreSQL, for instance), different types of user
1262+ databases (LDAP or SQL), etc.
1263+ .
1264+ This package provides the authentication service for nova-console. It grants
1265+ user requests for console access based on tokens in the identity service and
1266+ allows access to virtual consoles via a browser.
1267+
1268 Package: nova-doc
1269 Architecture: all
1270 Section: doc
1271 Depends: ${misc:Depends}
1272 Recommends: libjs-jquery
1273-Description: OpenStack Compute - documetation
1274+Description: OpenStack Compute - documentation
1275 OpenStack is a reliable cloud infrastructure. Its mission is to produce
1276 the ubiquitous cloud computing platform that will meet the needs of public
1277 and private cloud providers regardless of size, by being simple to implement
1278@@ -407,3 +571,72 @@
1279 databases (LDAP or SQL), etc.
1280 .
1281 This package contains the documentation for Nova.
1282+
1283+Package: nova-api-metadata
1284+Architecture: all
1285+Depends: ${ostack-lsb-base}, nova-common (= ${binary:Version}), ${python:Depends}, ${misc:Depends}
1286+Breaks: nova-api
1287+Description: OpenStack Compute - metadata API frontend
1288+ OpenStack is a reliable cloud infrastructure. Its mission is to produce
1289+ the ubiquitous cloud computing platform that will meet the needs of public
1290+ and private cloud providers regardless of size, by being simple to implement
1291+ and massively scalable.
1292+ .
1293+ OpenStack Compute, codenamed Nova, is a cloud computing fabric controller. In
1294+ addition to its "native" API (the OpenStack API), it also supports the Amazon
1295+ EC2 API.
1296+ .
1297+ This package provides the metadata API backend for guest VMs.
1298+
1299+Package: nova-api-os-compute
1300+Architecture: all
1301+Depends: ${ostack-lsb-base}, nova-common (= ${binary:Version}), ${python:Depends}, ${misc:Depends}
1302+Breaks: nova-api
1303+Description: OpenStack Compute - OpenStack Compute API frontend
1304+ OpenStack is a reliable cloud infrastructure. Its mission is to produce
1305+ the ubiquitous cloud computing platform that will meet the needs of public
1306+ and private cloud providers regardless of size, by being simple to implement
1307+ and massively scalable.
1308+ .
1309+ OpenStack Compute, codenamed Nova, is a cloud computing fabric controller. In
1310+ addition to its "native" API (the OpenStack API), it also supports the Amazon
1311+ EC2 API.
1312+ .
1313+ This package provides the OpenStack Compute API frontend.
1314+
1315+Package: nova-api-os-volume
1316+Architecture: all
1317+Depends: ${ostack-lsb-base}, nova-common (= ${binary:Version}), ${python:Depends}, ${misc:Depends}
1318+Breaks: nova-api
1319+Description: OpenStack Compute - OpenStack Volume API frontend
1320+ OpenStack is a reliable cloud infrastructure. Its mission is to produce
1321+ the ubiquitous cloud computing platform that will meet the needs of public
1322+ and private cloud providers regardless of size, by being simple to implement
1323+ and massively scalable.
1324+ .
1325+ OpenStack Compute, codenamed Nova, is a cloud computing fabric controller. In
1326+ addition to its "native" API (the OpenStack API), it also supports the Amazon
1327+ EC2 API.
1328+ .
1329+ This package provides the OpenStack Volume API frontend.
1330+
1331+Package: nova-api-ec2
1332+Architecture: all
1333+Depends: ${ostack-lsb-base}, nova-common (= ${binary:Version}), ${python:Depends}, ${misc:Depends}
1334+Breaks: nova-api
1335+Description: OpenStack Compute - EC2 API frontend
1336+ OpenStack is a reliable cloud infrastructure. Its mission is to produce
1337+ the ubiquitous cloud computing platform that will meet the needs of public
1338+ and private cloud providers regardless of size, by being simple to implement
1339+ and massively scalable.
1340+ .
1341+ OpenStack Compute, codenamed Nova, is a cloud computing fabric controller. In
1342+ addition to its "native" API (the OpenStack API), it also supports the Amazon
1343+ EC2 API.
1344+ .
1345+ Nova is intended to be modular and easy to extend and adapt. It supports many
1346+ different hypervisors (KVM and Xen to name a few), different database backends
1347+ (SQLite, MySQL, and PostgreSQL, for instance), different types of user
1348+ databases (LDAP or SQL), etc.
1349+ .
1350+ This package provides the EC2 API.
1351
1352=== modified file 'debian/copyright'
1353--- debian/copyright 2011-06-08 18:09:33 +0000
1354+++ debian/copyright 2012-05-25 10:20:02 +0000
1355@@ -1,9 +1,11 @@
1356-Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
1357-Name: nova
1358+Format: http://dep.debian.net/deps/dep5-
1359+Upstream-Name: nova
1360 Source: https://code.launchpad.net/nova
1361
1362 Files: *
1363-Copyright: 2010 United States Government as represented by the Administrator of the National Aeronautics and Space Administration.
1364+Copyright: 2010 United States Government as represented
1365+ by the Administrator of the National Aeronautics
1366+ and Space Administration.
1367 Copyright: 2010 OpenStack LLC
1368 Copyright: Others (See individual files for more details)
1369 License: Apache-2
1370@@ -23,8 +25,8 @@
1371 can be found in `/usr/share/common-licenses/Apache-2.0'.
1372
1373 Files: contrib/boto_v6/*
1374-Copyright: (c) 2006-2010, Mitch Garnaat http://garnaat.org/
1375- (c) 2010, Eucalyptus Systems, Inc.
1376+Copyright: 2006-2010, Mitch Garnaat http://garnaat.org/
1377+ 2010, Eucalyptus Systems, Inc.
1378 License: BSD-Style
1379
1380 Permission is hereby granted, free of charge, to any person obtaining a
1381@@ -34,10 +36,10 @@
1382 distribute, sublicense, and/or sell copies of the Software, and to
1383 permit persons to whom the Software is furnished to do so, subject to
1384 the following conditions:
1385-
1386+ .
1387 The above copyright notice and this permission notice shall be included
1388 in all copies or substantial portions of the Software.
1389-
1390+ .
1391 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
1392 OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
1393 MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
1394@@ -45,3 +47,4 @@
1395 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
1396 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
1397 DEALINGS IN THE SOFTWARE.
1398+
1399
1400=== removed file 'debian/debian_control_vars'
1401--- debian/debian_control_vars 2011-08-09 16:08:33 +0000
1402+++ debian/debian_control_vars 1970-01-01 00:00:00 +0000
1403@@ -1,3 +0,0 @@
1404-nova-compute-deps= lsb-base, qemu-utils, adduser, libvirt-bin (>= 0.9.0)
1405-ostack-lsb-base= lsb-base
1406-nova-compute-default-hypervisor=nova-compute-kvm
1407
1408=== added file 'debian/gbp.conf'
1409--- debian/gbp.conf 1970-01-01 00:00:00 +0000
1410+++ debian/gbp.conf 2012-05-25 10:20:02 +0000
1411@@ -0,0 +1,6 @@
1412+[DEFAULT]
1413+upstream-branch = master
1414+debian-branch = debian/unstable
1415+
1416+[git-buildpackage]
1417+export-dir = ../build-area/
1418
1419=== added file 'debian/mans/nova-api-ec2.8'
1420--- debian/mans/nova-api-ec2.8 1970-01-01 00:00:00 +0000
1421+++ debian/mans/nova-api-ec2.8 2012-05-25 10:20:02 +0000
1422@@ -0,0 +1,20 @@
1423+.TH nova\-api\-ec2.8
1424+.SH NAME
1425+nova\-api\-ec2 \- frontend EC2 API server for Nova
1426+
1427+.SH SYNOPSIS
1428+.B nova\-api\-ec2
1429+.B \-\-flagfile=<flagfilepath>
1430+
1431+.SH DESCRIPTION
1432+.B nova\-api\-ec2
1433+
1434+This man page is a stub. Please contribute.
1435+
1436+.SH PARAMETERS
1437+
1438+.LP
1439+.B \-\-flagfile=<flagfilepath>
1440+.IP
1441+
1442+Path to the file containing options.
1443
1444=== added file 'debian/mans/nova-api-metadata.8'
1445--- debian/mans/nova-api-metadata.8 1970-01-01 00:00:00 +0000
1446+++ debian/mans/nova-api-metadata.8 2012-05-25 10:20:02 +0000
1447@@ -0,0 +1,20 @@
1448+.TH nova\-api\-metadata.8
1449+.SH NAME
1450+nova\-api\-metadata \- frontend metadata API server for Nova
1451+
1452+.SH SYNOPSIS
1453+.B nova\-api\-metadata
1454+.B \-\-flagfile=<flagfilepath>
1455+
1456+.SH DESCRIPTION
1457+.B nova\-api\-metadata
1458+
1459+This man page is a stub. Please contribute.
1460+
1461+.SH PARAMETERS
1462+
1463+.LP
1464+.B \-\-flagfile=<flagfilepath>
1465+.IP
1466+
1467+Path to the file containing options.
1468
1469=== added file 'debian/mans/nova-api-os-compute.8'
1470--- debian/mans/nova-api-os-compute.8 1970-01-01 00:00:00 +0000
1471+++ debian/mans/nova-api-os-compute.8 2012-05-25 10:20:02 +0000
1472@@ -0,0 +1,20 @@
1473+.TH nova\-api\-os\-compute 8
1474+.SH NAME
1475+nova\-api\-os\-compute \- frontend API server for Nova Compute
1476+
1477+.SH SYNOPSIS
1478+.B nova\-api\-os\-compute
1479+.B \-\-flagfile=<flagfilepath>
1480+
1481+.SH DESCRIPTION
1482+.B nova\-api\-os\-compute
1483+
1484+This man page is a stub. Please contribute.
1485+
1486+.SH PARAMETERS
1487+
1488+.LP
1489+.B \-\-flagfile=<flagfilepath>
1490+.IP
1491+
1492+Path to the file containing options.
1493
1494=== added file 'debian/mans/nova-api-os-volume.8'
1495--- debian/mans/nova-api-os-volume.8 1970-01-01 00:00:00 +0000
1496+++ debian/mans/nova-api-os-volume.8 2012-05-25 10:20:02 +0000
1497@@ -0,0 +1,20 @@
1498+.TH nova\-api\-os\-volume 8
1499+.SH NAME
1500+nova\-api\-os\-volume \- frontend API server for Nova Volume
1501+
1502+.SH SYNOPSIS
1503+.B nova\-api\-os\-volume
1504+.B \-\-flagfile=<flagfilepath>
1505+
1506+.SH DESCRIPTION
1507+.B nova\-api\-os\-volume
1508+
1509+This man page is a stub. Please contribute.
1510+
1511+.SH PARAMETERS
1512+
1513+.LP
1514+.B \-\-flagfile=<flagfilepath>
1515+.IP
1516+
1517+Path to the file containing options.
1518
1519=== added file 'debian/mans/nova-cert.8'
1520--- debian/mans/nova-cert.8 1970-01-01 00:00:00 +0000
1521+++ debian/mans/nova-cert.8 2012-05-25 10:20:02 +0000
1522@@ -0,0 +1,20 @@
1523+.TH nova\-cert 8
1524+.SH NAME
1525+nova\-cert \- Manages x509 certificates for Nova
1526+
1527+.SH SYNOPSIS
1528+.B nova\-cert
1529+.B \-\-flagfile=<flagfilepath>
1530+
1531+.SH DESCRIPTION
1532+.B nova\-cert
1533+
1534+This man page is a stub. Please contribute.
1535+
1536+.SH PARAMETERS
1537+
1538+.LP
1539+.B \-\-flagfile=<flagfilepath>
1540+.IP
1541+
1542+Path to the file containing options.
1543
1544=== added file 'debian/mans/nova-console.8'
1545--- debian/mans/nova-console.8 1970-01-01 00:00:00 +0000
1546+++ debian/mans/nova-console.8 2012-05-25 10:20:02 +0000
1547@@ -0,0 +1,20 @@
1548+.TH nova\-console 8
1549+.SH NAME
1550+nova\-console \- nova VNC console proxy
1551+
1552+.SH SYNOPSIS
1553+.B nova\-console
1554+.B \-\-flagfile=<flagfilepath>
1555+
1556+.SH DESCRIPTION
1557+.B nova\-console
1558+
1559+This man page is a stub. Please contribute.
1560+
1561+.SH PARAMETERS
1562+
1563+.LP
1564+.B \-\-flagfile=<flagfilepath>
1565+.IP
1566+
1567+Path to the file containing options.
1568
1569=== added file 'debian/mans/nova-consoleauth.8'
1570--- debian/mans/nova-consoleauth.8 1970-01-01 00:00:00 +0000
1571+++ debian/mans/nova-consoleauth.8 2012-05-25 10:20:02 +0000
1572@@ -0,0 +1,20 @@
1573+.TH nova\-consoleauth 8
1574+.SH NAME
1575+nova\-console \- nova VNC console authenticator
1576+
1577+.SH SYNOPSIS
1578+.B nova\-consoleauth
1579+.B \-\-flagfile=<flagfilepath>
1580+
1581+.SH DESCRIPTION
1582+.B nova\-consoleauth
1583+
1584+This man page is a stub. Please contribute.
1585+
1586+.SH PARAMETERS
1587+
1588+.LP
1589+.B \-\-flagfile=<flagfilepath>
1590+.IP
1591+
1592+Path to the file containing options.
1593
1594=== added file 'debian/mans/nova-rootwrap.8'
1595--- debian/mans/nova-rootwrap.8 1970-01-01 00:00:00 +0000
1596+++ debian/mans/nova-rootwrap.8 2012-05-25 10:20:02 +0000
1597@@ -0,0 +1,20 @@
1598+.TH nova\-rootwrap 8
1599+.SH NAME
1600+nova\-rootwrap \- Authorizes and executes sudo commands on Nova's behalf
1601+
1602+.SH SYNOPSIS
1603+.B nova\-rootwrap
1604+.B <command>
1605+
1606+.SH DESCRIPTION
1607+.B nova\-rootwrap
1608+
1609+This man page is a stub. Please contribute.
1610+
1611+.SH PARAMETERS
1612+
1613+.LP
1614+.B <command>
1615+.IP
1616+
1617+Command to be executed with sudo
1618
1619=== removed file 'debian/nova-ajax-console-proxy.init'
1620--- debian/nova-ajax-console-proxy.init 2011-08-11 11:27:36 +0000
1621+++ debian/nova-ajax-console-proxy.init 1970-01-01 00:00:00 +0000
1622@@ -1,73 +0,0 @@
1623-#! /bin/sh
1624-### BEGIN INIT INFO
1625-# Provides: nova-ajax-console-proxy
1626-# Required-Start: $remote_fs $syslog
1627-# Required-Stop: $remote_fs $syslog
1628-# Default-Start: 2 3 4 5
1629-# Default-Stop: 0 1 6
1630-# Short-Description: nova ajax console proxy
1631-# Description: nova ajax console proxy is a publically reachable
1632-# component which proxies access to ajaxterm's running
1633-# on compute nodes
1634-### END INIT INFO
1635-
1636-set -e
1637-
1638-DAEMON=/usr/bin/nova-ajax-console-proxy
1639-DAEMON_ARGS="--flagfile=/etc/nova/nova.conf"
1640-PIDFILE=/var/run/nova/nova-ajax-console-proxy.pid
1641-
1642-ENABLED=true
1643-
1644-if test -f /etc/default/nova-ajax-console-proxy; then
1645- . /etc/default/nova-ajax-console-proxy
1646-fi
1647-
1648-mkdir -p /var/run/nova
1649-chown nova:root /var/run/nova/
1650-
1651-mkdir -p /var/lock/nova
1652-chown nova:root /var/lock/nova/
1653-
1654-uid="$(getent passwd nova | cut -f3 -d:)"
1655-gid="$(getent passwd nova | cut -f4 -d:)"
1656-
1657-. /lib/lsb/init-functions
1658-
1659-export PATH="${PATH:+$PATH:}/usr/sbin:/sbin"
1660-
1661-if ! [ -x ${DAEMON} ] ; then
1662- exit 0
1663-fi
1664-
1665-case "$1" in
1666- start)
1667- test "$ENABLED" = "true" || exit 0
1668- log_daemon_msg "Starting nova ajax console proxy" "nova-ajax-console-proxy"
1669- start-stop-daemon --start --chdir /var/run --chuid ${uid}:${gid} -b -m --pidfile ${PIDFILE} --exec ${DAEMON} -- ${DAEMON_ARGS}
1670- log_end_msg $?
1671- ;;
1672- stop)
1673- test "$ENABLED" = "true" || exit 0
1674- log_daemon_msg "Stopping nova ajax console proxy" "nova-ajax-console-proxy"
1675- start-stop-daemon --stop --oknodo --pidfile ${PIDFILE}
1676- log_end_msg $?
1677- ;;
1678- restart|force-reload)
1679- test "$ENABLED" = "true" || exit 1
1680- $0 stop
1681- sleep 1
1682- $0 start
1683- ;;
1684- status)
1685- test "$ENABLED" = "true" || exit 0
1686- # This is to be fixed: it doesn't exist in Debian
1687- status_of_proc -p $PIDFILE $DAEMON nova-ajax-console-proxy && exit 0 || exit $?
1688- ;;
1689- *)
1690- log_action_msg "Usage: $0 {start|stop|restart|force-reload|status}"
1691- exit 1
1692- ;;
1693-esac
1694-
1695-exit 0
1696
1697=== removed file 'debian/nova-ajax-console-proxy.install'
1698--- debian/nova-ajax-console-proxy.install 2011-03-30 11:32:43 +0000
1699+++ debian/nova-ajax-console-proxy.install 1970-01-01 00:00:00 +0000
1700@@ -1,1 +0,0 @@
1701-usr/bin/nova-ajax-console-proxy
1702
1703=== removed file 'debian/nova-ajax-console-proxy.logrotate'
1704--- debian/nova-ajax-console-proxy.logrotate 2011-03-30 11:32:43 +0000
1705+++ debian/nova-ajax-console-proxy.logrotate 1970-01-01 00:00:00 +0000
1706@@ -1,4 +0,0 @@
1707-/var/log/nova/nova-ajax-console-proxy.log {
1708- daily
1709- missingok
1710-}
1711
1712=== removed file 'debian/nova-ajax-console-proxy.manpages'
1713--- debian/nova-ajax-console-proxy.manpages 2011-04-15 14:57:18 +0000
1714+++ debian/nova-ajax-console-proxy.manpages 1970-01-01 00:00:00 +0000
1715@@ -1,1 +0,0 @@
1716-debian/mans/nova-ajax-console-proxy.8
1717
1718=== removed file 'debian/nova-ajax-console-proxy.upstart.in'
1719--- debian/nova-ajax-console-proxy.upstart.in 2011-08-11 13:29:06 +0000
1720+++ debian/nova-ajax-console-proxy.upstart.in 1970-01-01 00:00:00 +0000
1721@@ -1,18 +0,0 @@
1722-description "Nova AJAX console proxy"
1723-author "Soren Hansen <soren@linux2go.dk>"
1724-
1725-start on (filesystem and net-device-up IFACE!=lo)
1726-stop on runlevel [016]
1727-
1728-
1729-chdir /var/run
1730-
1731-pre-start script
1732- mkdir -p /var/run/nova
1733- chown nova:root /var/run/nova/
1734-
1735- mkdir -p /var/lock/nova
1736- chown nova:root /var/lock/nova/
1737-end script
1738-
1739-exec su -c "nova-ajax-console-proxy --flagfile=/etc/nova/nova.conf" nova
1740
1741=== added file 'debian/nova-api-ec2.init'
1742--- debian/nova-api-ec2.init 1970-01-01 00:00:00 +0000
1743+++ debian/nova-api-ec2.init 2012-05-25 10:20:02 +0000
1744@@ -0,0 +1,76 @@
1745+#! /bin/sh
1746+### BEGIN INIT INFO
1747+# Provides: nova-api-ec2
1748+# Required-Start: $remote_fs $syslog
1749+# Required-Stop: $remote_fs $syslog
1750+# Default-Start: 2 3 4 5
1751+# Default-Stop: 0 1 6
1752+# Short-Description: nova-api EC2 server
1753+# Description: frontend EC2 API server for Nova
1754+### END INIT INFO
1755+
1756+
1757+set -e
1758+
1759+DAEMON=/usr/bin/nova-api-ec2
1760+DAEMON_ARGS="--flagfile=/etc/nova/nova.conf"
1761+PIDFILE=/var/run/nova/nova-api-ec2.pid
1762+
1763+ENABLED=true
1764+
1765+if test -f /etc/default/nova-api-ec2; then
1766+ . /etc/default/nova-api-ec2
1767+fi
1768+
1769+mkdir -p /var/run/nova
1770+chown nova:root /var/run/nova/
1771+
1772+mkdir -p /var/lock/nova
1773+chown nova:root /var/lock/nova/
1774+
1775+uid="$(getent passwd nova | cut -f3 -d:)"
1776+gid="$(getent passwd nova | cut -f4 -d:)"
1777+
1778+. /lib/lsb/init-functions
1779+
1780+export PATH="${PATH:+$PATH:}/usr/sbin:/sbin"
1781+
1782+if ! [ -x ${DAEMON} ] ; then
1783+ exit 0
1784+fi
1785+
1786+case "$1" in
1787+ start)
1788+ test "$ENABLED" = "true" || exit 0
1789+ log_daemon_msg "Starting nova ec2 api" "nova-api-ec2"
1790+ start-stop-daemon --start --chdir /var/run --chuid ${uid}:${gid} -b -m --pidfile ${PIDFILE} --exec ${DAEMON} -- ${DAEMON_ARGS}
1791+ log_end_msg $?
1792+ ;;
1793+ stop)
1794+ test "$ENABLED" = "true" || exit 0
1795+ log_daemon_msg "Stopping nova ec2 api" "nova-api-ec2"
1796+ start-stop-daemon --stop --oknodo --pidfile ${PIDFILE}
1797+ log_end_msg $?
1798+ ;;
1799+ # Could we implement a reload if the daemon traps the -HUP signal? This would be done with:
1800+ # reload)
1801+ # start-stop-daemon --stop --signal HUP --pidfile ${PID_FILE}
1802+ # ;;
1803+ restart|force-reload)
1804+ test "$ENABLED" = "true" || exit 1
1805+ $0 stop
1806+ sleep 1
1807+ $0 start
1808+ ;;
1809+ status)
1810+ test "$ENABLED" = "true" || exit 0
1811+ # This is to be fixed: it doesn't exist in Debian
1812+ status_of_proc -p $PIDFILE $DAEMON nova-api && exit 0 || exit $?
1813+ ;;
1814+ *)
1815+ log_action_msg "Usage: /etc/init.d/nova-api-ec2 {start|stop|restart|force-reload|status}"
1816+ exit 1
1817+ ;;
1818+esac
1819+
1820+exit 0
1821
1822=== added file 'debian/nova-api-ec2.install'
1823--- debian/nova-api-ec2.install 1970-01-01 00:00:00 +0000
1824+++ debian/nova-api-ec2.install 2012-05-25 10:20:02 +0000
1825@@ -0,0 +1,1 @@
1826+usr/bin/nova-api-ec2
1827
1828=== added file 'debian/nova-api-ec2.logrotate'
1829--- debian/nova-api-ec2.logrotate 1970-01-01 00:00:00 +0000
1830+++ debian/nova-api-ec2.logrotate 2012-05-25 10:20:02 +0000
1831@@ -0,0 +1,4 @@
1832+/var/log/nova/nova-api-ec2.log {
1833+ daily
1834+ missingok
1835+}
1836
1837=== added file 'debian/nova-api-ec2.manpages'
1838--- debian/nova-api-ec2.manpages 1970-01-01 00:00:00 +0000
1839+++ debian/nova-api-ec2.manpages 2012-05-25 10:20:02 +0000
1840@@ -0,0 +1,1 @@
1841+debian/mans/nova-api-ec2.8
1842
1843=== added file 'debian/nova-api-ec2.upstart.in'
1844--- debian/nova-api-ec2.upstart.in 1970-01-01 00:00:00 +0000
1845+++ debian/nova-api-ec2.upstart.in 2012-05-25 10:20:02 +0000
1846@@ -0,0 +1,18 @@
1847+description "Nova EC2 API server"
1848+author "Joe Heck <heckj@mac.com>"
1849+
1850+start on (filesystem and net-device-up IFACE!=lo)
1851+stop on runlevel [016]
1852+
1853+
1854+chdir /var/run
1855+
1856+pre-start script
1857+ mkdir -p /var/run/nova
1858+ chown nova:root /var/run/nova/
1859+
1860+ mkdir -p /var/lock/nova
1861+ chown nova:root /var/lock/nova/
1862+end script
1863+
1864+exec su -s /bin/sh -c "exec nova-api-ec2 --flagfile=/etc/nova/nova.conf" nova
1865
1866=== added file 'debian/nova-api-metadata.init'
1867--- debian/nova-api-metadata.init 1970-01-01 00:00:00 +0000
1868+++ debian/nova-api-metadata.init 2012-05-25 10:20:02 +0000
1869@@ -0,0 +1,76 @@
1870+#! /bin/sh
1871+### BEGIN INIT INFO
1872+# Provides: nova-api-metadata
1873+# Required-Start: $remote_fs $syslog
1874+# Required-Stop: $remote_fs $syslog
1875+# Default-Start: 2 3 4 5
1876+# Default-Stop: 0 1 6
1877+# Short-Description: nova-api metadata server
1878+# Description: frontend Metadata API server for Nova
1879+### END INIT INFO
1880+
1881+
1882+set -e
1883+
1884+DAEMON=/usr/bin/nova-api-metadata
1885+DAEMON_ARGS="--flagfile=/etc/nova/nova.conf"
1886+PIDFILE=/var/run/nova/nova-api-metadata.pid
1887+
1888+ENABLED=true
1889+
1890+if test -f /etc/default/nova-api-metadata; then
1891+ . /etc/default/nova-api-metadata
1892+fi
1893+
1894+mkdir -p /var/run/nova
1895+chown nova:root /var/run/nova/
1896+
1897+mkdir -p /var/lock/nova
1898+chown nova:root /var/lock/nova/
1899+
1900+uid="$(getent passwd nova | cut -f3 -d:)"
1901+gid="$(getent passwd nova | cut -f4 -d:)"
1902+
1903+. /lib/lsb/init-functions
1904+
1905+export PATH="${PATH:+$PATH:}/usr/sbin:/sbin"
1906+
1907+if ! [ -x ${DAEMON} ] ; then
1908+ exit 0
1909+fi
1910+
1911+case "$1" in
1912+ start)
1913+ test "$ENABLED" = "true" || exit 0
1914+ log_daemon_msg "Starting nova metadata api" "nova-api-metadata"
1915+ start-stop-daemon --start --chdir /var/run --chuid ${uid}:${gid} -b -m --pidfile ${PIDFILE} --exec ${DAEMON} -- ${DAEMON_ARGS}
1916+ log_end_msg $?
1917+ ;;
1918+ stop)
1919+ test "$ENABLED" = "true" || exit 0
1920+ log_daemon_msg "Stopping nova metdata api" "nova-api-metadata"
1921+ start-stop-daemon --stop --oknodo --pidfile ${PIDFILE}
1922+ log_end_msg $?
1923+ ;;
1924+ # Could we implement a reload if the daemon traps the -HUP signal? This would be done with:
1925+ # reload)
1926+ # start-stop-daemon --stop --signal HUP --pidfile ${PID_FILE}
1927+ # ;;
1928+ restart|force-reload)
1929+ test "$ENABLED" = "true" || exit 1
1930+ $0 stop
1931+ sleep 1
1932+ $0 start
1933+ ;;
1934+ status)
1935+ test "$ENABLED" = "true" || exit 0
1936+ # This is to be fixed: it doesn't exist in Debian
1937+ status_of_proc -p $PIDFILE $DAEMON nova-api && exit 0 || exit $?
1938+ ;;
1939+ *)
1940+ log_action_msg "Usage: /etc/init.d/nova-api-metadata {start|stop|restart|force-reload|status}"
1941+ exit 1
1942+ ;;
1943+esac
1944+
1945+exit 0
1946
1947=== added file 'debian/nova-api-metadata.install'
1948--- debian/nova-api-metadata.install 1970-01-01 00:00:00 +0000
1949+++ debian/nova-api-metadata.install 2012-05-25 10:20:02 +0000
1950@@ -0,0 +1,1 @@
1951+usr/bin/nova-api-metadata
1952
1953=== added file 'debian/nova-api-metadata.logrotate'
1954--- debian/nova-api-metadata.logrotate 1970-01-01 00:00:00 +0000
1955+++ debian/nova-api-metadata.logrotate 2012-05-25 10:20:02 +0000
1956@@ -0,0 +1,4 @@
1957+/var/log/nova/nova-api-metadata.log {
1958+ daily
1959+ missingok
1960+}
1961
1962=== added file 'debian/nova-api-metadata.manpages'
1963--- debian/nova-api-metadata.manpages 1970-01-01 00:00:00 +0000
1964+++ debian/nova-api-metadata.manpages 2012-05-25 10:20:02 +0000
1965@@ -0,0 +1,1 @@
1966+debian/mans/nova-api-metadata.8
1967
1968=== added file 'debian/nova-api-metadata.upstart.in'
1969--- debian/nova-api-metadata.upstart.in 1970-01-01 00:00:00 +0000
1970+++ debian/nova-api-metadata.upstart.in 2012-05-25 10:20:02 +0000
1971@@ -0,0 +1,18 @@
1972+description "Nova Metadata API server"
1973+author "Joe Heck <heckj@mac.com>"
1974+
1975+start on (filesystem and net-device-up IFACE!=lo)
1976+stop on runlevel [016]
1977+
1978+
1979+chdir /var/run
1980+
1981+pre-start script
1982+ mkdir -p /var/run/nova
1983+ chown nova:root /var/run/nova/
1984+
1985+ mkdir -p /var/lock/nova
1986+ chown nova:root /var/lock/nova/
1987+end script
1988+
1989+exec su -s /bin/sh -c "exec nova-api-metadata --flagfile=/etc/nova/nova.conf" nova
1990
1991=== added file 'debian/nova-api-os-compute.init'
1992--- debian/nova-api-os-compute.init 1970-01-01 00:00:00 +0000
1993+++ debian/nova-api-os-compute.init 2012-05-25 10:20:02 +0000
1994@@ -0,0 +1,76 @@
1995+#! /bin/sh
1996+### BEGIN INIT INFO
1997+# Provides: nova-api-os-compute
1998+# Required-Start: $remote_fs $syslog
1999+# Required-Stop: $remote_fs $syslog
2000+# Default-Start: 2 3 4 5
2001+# Default-Stop: 0 1 6
2002+# Short-Description: nova-api compute openstack server
2003+# Description: frontend OpenStack Compute API server for Nova
2004+### END INIT INFO
2005+
2006+
2007+set -e
2008+
2009+DAEMON=/usr/bin/nova-api-os-compute
2010+DAEMON_ARGS="--flagfile=/etc/nova/nova.conf"
2011+PIDFILE=/var/run/nova/nova-api-os-compute.pid
2012+
2013+ENABLED=true
2014+
2015+if test -f /etc/default/nova-api-os-compute; then
2016+ . /etc/default/nova-api-os-compute
2017+fi
2018+
2019+mkdir -p /var/run/nova
2020+chown nova:root /var/run/nova/
2021+
2022+mkdir -p /var/lock/nova
2023+chown nova:root /var/lock/nova/
2024+
2025+uid="$(getent passwd nova | cut -f3 -d:)"
2026+gid="$(getent passwd nova | cut -f4 -d:)"
2027+
2028+. /lib/lsb/init-functions
2029+
2030+export PATH="${PATH:+$PATH:}/usr/sbin:/sbin"
2031+
2032+if ! [ -x ${DAEMON} ] ; then
2033+ exit 0
2034+fi
2035+
2036+case "$1" in
2037+ start)
2038+ test "$ENABLED" = "true" || exit 0
2039+ log_daemon_msg "Starting nova openstack compute api" "nova-api-os-compute"
2040+ start-stop-daemon --start --chdir /var/run --chuid ${uid}:${gid} -b -m --pidfile ${PIDFILE} --exec ${DAEMON} -- ${DAEMON_ARGS}
2041+ log_end_msg $?
2042+ ;;
2043+ stop)
2044+ test "$ENABLED" = "true" || exit 0
2045+ log_daemon_msg "Stopping nova openstack compute api" "nova-api-os-compute"
2046+ start-stop-daemon --stop --oknodo --pidfile ${PIDFILE}
2047+ log_end_msg $?
2048+ ;;
2049+ # Could we implement a reload if the daemon traps the -HUP signal? This would be done with:
2050+ # reload)
2051+ # start-stop-daemon --stop --signal HUP --pidfile ${PID_FILE}
2052+ # ;;
2053+ restart|force-reload)
2054+ test "$ENABLED" = "true" || exit 1
2055+ $0 stop
2056+ sleep 1
2057+ $0 start
2058+ ;;
2059+ status)
2060+ test "$ENABLED" = "true" || exit 0
2061+ # This is to be fixed: it doesn't exist in Debian
2062+ status_of_proc -p $PIDFILE $DAEMON nova-api-os-compute && exit 0 || exit $?
2063+ ;;
2064+ *)
2065+ log_action_msg "Usage: /etc/init.d/nova-api-os-compute {start|stop|restart|force-reload|status}"
2066+ exit 1
2067+ ;;
2068+esac
2069+
2070+exit 0
2071
2072=== added file 'debian/nova-api-os-compute.install'
2073--- debian/nova-api-os-compute.install 1970-01-01 00:00:00 +0000
2074+++ debian/nova-api-os-compute.install 2012-05-25 10:20:02 +0000
2075@@ -0,0 +1,1 @@
2076+usr/bin/nova-api-os-compute
2077
2078=== added file 'debian/nova-api-os-compute.logrotate'
2079--- debian/nova-api-os-compute.logrotate 1970-01-01 00:00:00 +0000
2080+++ debian/nova-api-os-compute.logrotate 2012-05-25 10:20:02 +0000
2081@@ -0,0 +1,4 @@
2082+/var/log/nova/nova-api-os-compute.log {
2083+ daily
2084+ missingok
2085+}
2086
2087=== added file 'debian/nova-api-os-compute.manpages'
2088--- debian/nova-api-os-compute.manpages 1970-01-01 00:00:00 +0000
2089+++ debian/nova-api-os-compute.manpages 2012-05-25 10:20:02 +0000
2090@@ -0,0 +1,1 @@
2091+debian/mans/nova-api-os-compute.8
2092
2093=== added file 'debian/nova-api-os-compute.upstart.in'
2094--- debian/nova-api-os-compute.upstart.in 1970-01-01 00:00:00 +0000
2095+++ debian/nova-api-os-compute.upstart.in 2012-05-25 10:20:02 +0000
2096@@ -0,0 +1,18 @@
2097+description "Nova OpenStack Compute API server"
2098+author "Joe Heck <heckj@mac.com>"
2099+
2100+start on (filesystem and net-device-up IFACE!=lo)
2101+stop on runlevel [016]
2102+
2103+
2104+chdir /var/run
2105+
2106+pre-start script
2107+ mkdir -p /var/run/nova
2108+ chown nova:root /var/run/nova/
2109+
2110+ mkdir -p /var/lock/nova
2111+ chown nova:root /var/lock/nova/
2112+end script
2113+
2114+exec su -s /bin/sh -c "exec nova-api-os-compute --flagfile=/etc/nova/nova.conf" nova
2115
2116=== added file 'debian/nova-api-os-volume.init'
2117--- debian/nova-api-os-volume.init 1970-01-01 00:00:00 +0000
2118+++ debian/nova-api-os-volume.init 2012-05-25 10:20:02 +0000
2119@@ -0,0 +1,76 @@
2120+#! /bin/sh
2121+### BEGIN INIT INFO
2122+# Provides: nova-api-os-volume
2123+# Required-Start: $remote_fs $syslog
2124+# Required-Stop: $remote_fs $syslog
2125+# Default-Start: 2 3 4 5
2126+# Default-Stop: 0 1 6
2127+# Short-Description: nova-api volume openstack server
2128+# Description: frontend OpenStack Volume API server for Nova
2129+### END INIT INFO
2130+
2131+
2132+set -e
2133+
2134+DAEMON=/usr/bin/nova-api-os-volume
2135+DAEMON_ARGS="--flagfile=/etc/nova/nova.conf"
2136+PIDFILE=/var/run/nova/nova-api-os-volume.pid
2137+
2138+ENABLED=true
2139+
2140+if test -f /etc/default/nova-api-os-volume; then
2141+ . /etc/default/nova-api-os-volume
2142+fi
2143+
2144+mkdir -p /var/run/nova
2145+chown nova:root /var/run/nova/
2146+
2147+mkdir -p /var/lock/nova
2148+chown nova:root /var/lock/nova/
2149+
2150+uid="$(getent passwd nova | cut -f3 -d:)"
2151+gid="$(getent passwd nova | cut -f4 -d:)"
2152+
2153+. /lib/lsb/init-functions
2154+
2155+export PATH="${PATH:+$PATH:}/usr/sbin:/sbin"
2156+
2157+if ! [ -x ${DAEMON} ] ; then
2158+ exit 0
2159+fi
2160+
2161+case "$1" in
2162+ start)
2163+ test "$ENABLED" = "true" || exit 0
2164+ log_daemon_msg "Starting nova openstack volume api" "nova-api-os-volume"
2165+ start-stop-daemon --start --chdir /var/run --chuid ${uid}:${gid} -b -m --pidfile ${PIDFILE} --exec ${DAEMON} -- ${DAEMON_ARGS}
2166+ log_end_msg $?
2167+ ;;
2168+ stop)
2169+ test "$ENABLED" = "true" || exit 0
2170+ log_daemon_msg "Stopping nova openstack volume api" "nova-api-os-volume"
2171+ start-stop-daemon --stop --oknodo --pidfile ${PIDFILE}
2172+ log_end_msg $?
2173+ ;;
2174+ # Could we implement a reload if the daemon traps the -HUP signal? This would be done with:
2175+ # reload)
2176+ # start-stop-daemon --stop --signal HUP --pidfile ${PID_FILE}
2177+ # ;;
2178+ restart|force-reload)
2179+ test "$ENABLED" = "true" || exit 1
2180+ $0 stop
2181+ sleep 1
2182+ $0 start
2183+ ;;
2184+ status)
2185+ test "$ENABLED" = "true" || exit 0
2186+ # This is to be fixed: it doesn't exist in Debian
2187+ status_of_proc -p $PIDFILE $DAEMON nova-api-os-volume && exit 0 || exit $?
2188+ ;;
2189+ *)
2190+ log_action_msg "Usage: /etc/init.d/nova-api-os-volume {start|stop|restart|force-reload|status}"
2191+ exit 1
2192+ ;;
2193+esac
2194+
2195+exit 0
2196
2197=== added file 'debian/nova-api-os-volume.install'
2198--- debian/nova-api-os-volume.install 1970-01-01 00:00:00 +0000
2199+++ debian/nova-api-os-volume.install 2012-05-25 10:20:02 +0000
2200@@ -0,0 +1,1 @@
2201+usr/bin/nova-api-os-volume
2202
2203=== added file 'debian/nova-api-os-volume.logrotate'
2204--- debian/nova-api-os-volume.logrotate 1970-01-01 00:00:00 +0000
2205+++ debian/nova-api-os-volume.logrotate 2012-05-25 10:20:02 +0000
2206@@ -0,0 +1,4 @@
2207+/var/log/nova/nova-api-os-volume.log {
2208+ daily
2209+ missingok
2210+}
2211
2212=== added file 'debian/nova-api-os-volume.manpages'
2213--- debian/nova-api-os-volume.manpages 1970-01-01 00:00:00 +0000
2214+++ debian/nova-api-os-volume.manpages 2012-05-25 10:20:02 +0000
2215@@ -0,0 +1,1 @@
2216+debian/mans/nova-api-os-volume.8
2217
2218=== added file 'debian/nova-api-os-volume.upstart.in'
2219--- debian/nova-api-os-volume.upstart.in 1970-01-01 00:00:00 +0000
2220+++ debian/nova-api-os-volume.upstart.in 2012-05-25 10:20:02 +0000
2221@@ -0,0 +1,18 @@
2222+description "Nova OpenStack Volume API server"
2223+author "Joe Heck <heckj@mac.com>"
2224+
2225+start on (filesystem and net-device-up IFACE!=lo)
2226+stop on runlevel [016]
2227+
2228+
2229+chdir /var/run
2230+
2231+pre-start script
2232+ mkdir -p /var/run/nova
2233+ chown nova:root /var/run/nova/
2234+
2235+ mkdir -p /var/lock/nova
2236+ chown nova:root /var/lock/nova/
2237+end script
2238+
2239+exec su -s /bin/sh -c "exec nova-api-os-volume --flagfile=/etc/nova/nova.conf" nova
2240
2241=== modified file 'debian/nova-api.init'
2242--- debian/nova-api.init 2011-08-11 11:27:36 +0000
2243+++ debian/nova-api.init 2012-05-25 10:20:02 +0000
2244@@ -1,76 +1,97 @@
2245-#! /bin/sh
2246+#!/bin/sh
2247 ### BEGIN INIT INFO
2248 # Provides: nova-api
2249-# Required-Start: $remote_fs $syslog
2250-# Required-Stop: $remote_fs $syslog
2251+# Required-Start: $network $local_fs $remote_fs $syslog
2252+# Required-Stop: $remote_fs
2253 # Default-Start: 2 3 4 5
2254 # Default-Stop: 0 1 6
2255-# Short-Description: nova-api server
2256-# Description: frontend API server for Nova
2257+# Short-Description: Nova API server
2258+# Description: Frontend Nova API server
2259 ### END INIT INFO
2260
2261-
2262-set -e
2263-
2264+# Author: Julien Danjou <acid@debian.org>
2265+
2266+# PATH should only include /usr/* if it runs after the mountnfs.sh script
2267+PATH=/sbin:/usr/sbin:/bin:/usr/bin
2268+DESC="OpenStack Compute API"
2269+NAME=nova-api
2270 DAEMON=/usr/bin/nova-api
2271 DAEMON_ARGS="--flagfile=/etc/nova/nova.conf"
2272-PIDFILE=/var/run/nova/nova-api.pid
2273-
2274-ENABLED=true
2275-
2276-if test -f /etc/default/nova-api; then
2277- . /etc/default/nova-api
2278-fi
2279-
2280-mkdir -p /var/run/nova
2281-chown nova:root /var/run/nova/
2282-
2283-mkdir -p /var/lock/nova
2284-chown nova:root /var/lock/nova/
2285-
2286-uid="$(getent passwd nova | cut -f3 -d:)"
2287-gid="$(getent passwd nova | cut -f4 -d:)"
2288+PIDFILE=/var/run/$NAME.pid
2289+SCRIPTNAME=/etc/init.d/$NAME
2290+NOVA_USER=nova
2291+LOCK_DIR=/var/lock/nova/
2292+
2293+# Exit if the package is not installed
2294+[ -x $DAEMON ] || exit 0
2295+
2296+mkdir -p ${LOCK_DIR}
2297+chown ${NOVA_USER} ${LOCK_DIR}
2298+
2299+# Read configuration variable file if it is present
2300+[ -r /etc/default/$NAME ] && . /etc/default/$NAME
2301
2302 . /lib/lsb/init-functions
2303
2304-export PATH="${PATH:+$PATH:}/usr/sbin:/sbin"
2305+do_start()
2306+{
2307+ start-stop-daemon --start --background --quiet --chuid ${NOVA_USER}:nova --make-pidfile --pidfile $PIDFILE --startas $DAEMON --test > /dev/null \
2308+ || return 1
2309+ start-stop-daemon --start --background --quiet --chuid ${NOVA_USER}:nova --make-pidfile --pidfile $PIDFILE --startas $DAEMON -- \
2310+ $DAEMON_ARGS \
2311+ || return 2
2312+}
2313
2314-if ! [ -x ${DAEMON} ] ; then
2315- exit 0
2316-fi
2317+do_stop()
2318+{
2319+ start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE
2320+ RETVAL="$?"
2321+ rm -f $PIDFILE
2322+ return "$RETVAL"
2323+}
2324
2325 case "$1" in
2326 start)
2327- test "$ENABLED" = "true" || exit 0
2328- log_daemon_msg "Starting nova api" "nova-api"
2329- start-stop-daemon --start --chdir /var/run --chuid ${uid}:${gid} -b -m --pidfile ${PIDFILE} --exec ${DAEMON} -- ${DAEMON_ARGS}
2330- log_end_msg $?
2331- ;;
2332+ log_daemon_msg "Starting $DESC " "$NAME"
2333+ do_start
2334+ case "$?" in
2335+ 0|1) log_end_msg 0 ;;
2336+ 2) log_end_msg 1 ;;
2337+ esac
2338+ ;;
2339 stop)
2340- test "$ENABLED" = "true" || exit 0
2341- log_daemon_msg "Stopping nova api" "nova-api"
2342- start-stop-daemon --stop --oknodo --pidfile ${PIDFILE}
2343- log_end_msg $?
2344- ;;
2345- # Could we implement a reload if the daemon traps the -HUP signal? This would be done with:
2346- # reload)
2347- # start-stop-daemon --stop --signal HUP --pidfile ${PID_FILE}
2348- # ;;
2349+ log_daemon_msg "Stopping $DESC" "$NAME"
2350+ do_stop
2351+ case "$?" in
2352+ 0|1) log_end_msg 0 ;;
2353+ 2) log_end_msg 1 ;;
2354+ esac
2355+ ;;
2356+ status)
2357+ status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
2358+ ;;
2359 restart|force-reload)
2360- test "$ENABLED" = "true" || exit 1
2361- $0 stop
2362- sleep 1
2363- $0 start
2364- ;;
2365- status)
2366- test "$ENABLED" = "true" || exit 0
2367- # This is to be fixed: it doesn't exist in Debian
2368- status_of_proc -p $PIDFILE $DAEMON nova-api && exit 0 || exit $?
2369- ;;
2370+ log_daemon_msg "Restarting $DESC" "$NAME"
2371+ do_stop
2372+ case "$?" in
2373+ 0|1)
2374+ do_start
2375+ case "$?" in
2376+ 0) log_end_msg 0 ;;
2377+ 1) log_end_msg 1 ;; # Old process is still running
2378+ *) log_end_msg 1 ;; # Failed to start
2379+ esac
2380+ ;;
2381+ *)
2382+ # Failed to stop
2383+ log_end_msg 1
2384+ ;;
2385+ esac
2386+ ;;
2387 *)
2388- log_action_msg "Usage: /etc/init.d/nova-api {start|stop|restart|force-reload|status}"
2389- exit 1
2390- ;;
2391+ echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
2392+ exit 3
2393+ ;;
2394 esac
2395
2396-exit 0
2397+:
2398
2399=== modified file 'debian/nova-api.install'
2400--- debian/nova-api.install 2011-09-22 17:03:02 +0000
2401+++ debian/nova-api.install 2012-05-25 10:20:02 +0000
2402@@ -1,2 +1,1 @@
2403 usr/bin/nova-api
2404-debian/api-paste.ini etc/nova
2405
2406=== modified file 'debian/nova-api.upstart.in'
2407--- debian/nova-api.upstart.in 2011-08-11 13:29:06 +0000
2408+++ debian/nova-api.upstart.in 2012-05-25 10:20:02 +0000
2409@@ -15,4 +15,4 @@
2410 chown nova:root /var/lock/nova/
2411 end script
2412
2413-exec su -c "nova-api --flagfile=/etc/nova/nova.conf" nova
2414+exec su -s /bin/sh -c "exec nova-api --flagfile=/etc/nova/nova.conf" nova
2415
2416=== added file 'debian/nova-cert.init'
2417--- debian/nova-cert.init 1970-01-01 00:00:00 +0000
2418+++ debian/nova-cert.init 2012-05-25 10:20:02 +0000
2419@@ -0,0 +1,71 @@
2420+#! /bin/sh
2421+### BEGIN INIT INFO
2422+# Provides: nova-cert
2423+# Required-Start: $remote_fs $syslog
2424+# Required-Stop: $remote_fs $syslog
2425+# Default-Start: 2 3 4 5
2426+# Default-Stop: 0 1 6
2427+# Short-Description: nova-cert
2428+# Description: Schedules instances, volumes, etc. for Nova
2429+### END INIT INFO
2430+
2431+
2432+set -e
2433+
2434+DAEMON=/usr/bin/nova-cert
2435+DAEMON_ARGS="--flagfile=/etc/nova/nova.conf"
2436+PIDFILE=/var/run/nova/nova-cert.pid
2437+
2438+ENABLED=true
2439+
2440+if test -f /etc/default/nova-cert; then
2441+ . /etc/default/nova-cert
2442+fi
2443+
2444+mkdir -p /var/run/nova
2445+chown nova:root /var/run/nova/
2446+
2447+mkdir -p /var/lock/nova
2448+chown nova:root /var/lock/nova/
2449+
2450+uid="$(getent passwd nova | cut -f3 -d:)"
2451+gid="$(getent passwd nova | cut -f4 -d:)"
2452+
2453+. /lib/lsb/init-functions
2454+
2455+export PATH="${PATH:+$PATH:}/usr/sbin:/sbin"
2456+
2457+if ! [ -x ${DAEMON} ] ; then
2458+ exit 0
2459+fi
2460+
2461+case "$1" in
2462+ start)
2463+ test "$ENABLED" = "true" || exit 0
2464+ log_daemon_msg "Starting nova cert" "nova-cert"
2465+ start-stop-daemon --start --chdir /var/run --chuid ${uid}:${gid} -b -m --pidfile ${PIDFILE} --exec ${DAEMON} -- ${DAEMON_ARGS}
2466+ log_end_msg $?
2467+ ;;
2468+ stop)
2469+ test "$ENABLED" = "true" || exit 0
2470+ log_daemon_msg "Stopping nova cert" "nova-cert"
2471+ start-stop-daemon --stop --oknodo --pidfile ${PIDFILE}
2472+ log_end_msg $?
2473+ ;;
2474+ restart|force-reload)
2475+ test "$ENABLED" = "true" || exit 1
2476+ $0 stop
2477+ sleep 1
2478+ $0 start
2479+ ;;
2480+ status)
2481+ test "$ENABLED" = "true" || exit 0
2482+ status_of_proc -p $PIDFILE $DAEMON nova-cert && exit 0 || exit $?
2483+ ;;
2484+ *)
2485+ log_action_msg "Usage: /etc/init.d/nova-cert {start|stop|restart|force-reload|status}"
2486+ exit 1
2487+ ;;
2488+esac
2489+
2490+exit 0
2491
2492=== added file 'debian/nova-cert.install'
2493--- debian/nova-cert.install 1970-01-01 00:00:00 +0000
2494+++ debian/nova-cert.install 2012-05-25 10:20:02 +0000
2495@@ -0,0 +1,1 @@
2496+usr/bin/nova-cert
2497
2498=== added file 'debian/nova-cert.logrotate'
2499--- debian/nova-cert.logrotate 1970-01-01 00:00:00 +0000
2500+++ debian/nova-cert.logrotate 2012-05-25 10:20:02 +0000
2501@@ -0,0 +1,4 @@
2502+/var/log/nova/nova-cert.log {
2503+ daily
2504+ missingok
2505+}
2506
2507=== added file 'debian/nova-cert.manpages'
2508--- debian/nova-cert.manpages 1970-01-01 00:00:00 +0000
2509+++ debian/nova-cert.manpages 2012-05-25 10:20:02 +0000
2510@@ -0,0 +1,1 @@
2511+debian/mans/nova-cert.8
2512
2513=== added file 'debian/nova-cert.upstart.in'
2514--- debian/nova-cert.upstart.in 1970-01-01 00:00:00 +0000
2515+++ debian/nova-cert.upstart.in 2012-05-25 10:20:02 +0000
2516@@ -0,0 +1,18 @@
2517+description "Nova cert"
2518+author "Soren Hansen <soren@linux2go.dk>"
2519+
2520+start on (filesystem and net-device-up IFACE!=lo)
2521+stop on runlevel [016]
2522+
2523+
2524+chdir /var/run
2525+
2526+pre-start script
2527+ mkdir -p /var/run/nova
2528+ chown nova:root /var/run/nova/
2529+
2530+ mkdir -p /var/lock/nova
2531+ chown nova:root /var/lock/nova/
2532+end script
2533+
2534+exec su -s /bin/sh -c "exec nova-cert --flagfile=/etc/nova/nova.conf" nova
2535
2536=== modified file 'debian/nova-common.install'
2537--- debian/nova-common.install 2011-04-05 19:13:43 +0000
2538+++ debian/nova-common.install 2012-05-25 10:20:02 +0000
2539@@ -1,3 +1,7 @@
2540 usr/bin/nova-manage
2541+usr/bin/nova-rootwrap
2542+etc/nova/policy.json etc/nova
2543+etc/nova/api-paste.ini etc/nova
2544 debian/nova_sudoers etc/sudoers.d
2545 debian/nova.conf etc/nova
2546+etc/nova/policy.json etc/nova
2547
2548=== added file 'debian/nova-common.manpages'
2549--- debian/nova-common.manpages 1970-01-01 00:00:00 +0000
2550+++ debian/nova-common.manpages 2012-05-25 10:20:02 +0000
2551@@ -0,0 +1,2 @@
2552+debian/mans/nova-rootwrap.8
2553+doc/build/man/nova-manage.1
2554
2555=== removed file 'debian/nova-common.manpages.in'
2556--- debian/nova-common.manpages.in 2011-04-15 15:31:12 +0000
2557+++ debian/nova-common.manpages.in 1970-01-01 00:00:00 +0000
2558@@ -1,1 +0,0 @@
2559-doc/doc/build/man/nova-manage.1
2560
2561=== added file 'debian/nova-common.nova-manage.logrotate'
2562--- debian/nova-common.nova-manage.logrotate 1970-01-01 00:00:00 +0000
2563+++ debian/nova-common.nova-manage.logrotate 2012-05-25 10:20:02 +0000
2564@@ -0,0 +1,4 @@
2565+/var/log/nova/nova-manage.log {
2566+ daily
2567+ missingok
2568+}
2569
2570=== modified file 'debian/nova-common.postinst'
2571--- debian/nova-common.postinst 2011-10-03 10:49:08 +0000
2572+++ debian/nova-common.postinst 2012-05-25 10:20:02 +0000
2573@@ -4,13 +4,37 @@
2574 if ! getent group nova > /dev/null 2>&1; then
2575 addgroup --system nova >/dev/null
2576 fi
2577+
2578 if ! getent passwd nova > /dev/null 2>&1; then
2579- adduser --system --home /var/lib/nova --ingroup nova --no-create-home --shell /bin/bash nova
2580- fi
2581+ adduser --system --home /var/lib/nova --ingroup nova --no-create-home --shell /bin/false nova
2582+ fi
2583+
2584+ if [ "$(id -gn nova)" = "nogroup" ]; then
2585+ usermod -g nova nova
2586+ fi
2587+
2588+ if [ -z "$2" ]; then
2589+ # New install - blanket permissions
2590+ chown -R nova:nova /var/lib/nova/
2591+ elif dpkg --compare-versions "$2" lt "2011.3-0ubuntu4"; then
2592+ # make sure that LXC rootfs mount points are excleuded
2593+ # during upgrades from previous versions
2594+ find /var/lib/nova/ -name 'rootfs' -prune -o \
2595+ -group root -a -user nova -exec chown nova:nova {} \;
2596+ find /var/lib/nova/ -name 'rootfs' -prune -o \
2597+ -group nogroup -a -user nova -exec chown nova:nova {} \;
2598+ fi
2599+
2600 if [ "$(id -gn nova)" = "nogroup" ]; then
2601 usermod -g nova nova
2602 fi
2603- chown -R nova:nova /var/log/nova/ /etc/nova/nova.conf
2604+
2605+ if dpkg --compare-versions "$2" lt "2012.1~e3-0ubuntu2"; then
2606+ usermod -s "/bin/false" nova
2607+ fi
2608+
2609+ chown -R nova:nova /var/log/nova/ /etc/nova/
2610+
2611 if [ -z "$2" ]; then
2612 # New install - blanket permissions
2613 chown -R nova:nova /var/lib/nova/
2614@@ -22,13 +46,25 @@
2615 find /var/lib/nova/ -name 'rootfs' -prune -o \
2616 -group nogroup -a -user nova -exec chown nova:nova {} \;
2617 fi
2618- chmod 600 /etc/nova/nova.conf
2619+
2620+ chmod 0600 /etc/nova/nova.conf
2621+ chmod 0600 /etc/nova/policy.json
2622+ chmod 0600 /etc/nova/api-paste.ini
2623+ chmod 0700 /etc/nova
2624 chmod 0440 /etc/sudoers.d/nova_sudoers
2625 chmod 0700 /var/log/nova
2626+
2627 if ! grep -q sql_connection /etc/nova/nova.conf
2628 then
2629- su -c 'nova-manage db sync' nova
2630- fi
2631+ su -s /bin/sh -c 'nova-manage db sync' nova
2632+ fi
2633+
2634+ if [ -e /var/lib/nova/nova.sqlite ]
2635+ then
2636+ chown nova:nova /var/lib/nova/nova.sqlite
2637+ chmod 0600 /var/lib/nova/nova.sqlite
2638+ fi
2639+
2640 fi
2641
2642 #DEBHELPER#
2643
2644=== added file 'debian/nova-compute-kvm.postinst'
2645--- debian/nova-compute-kvm.postinst 1970-01-01 00:00:00 +0000
2646+++ debian/nova-compute-kvm.postinst 2012-05-25 10:20:02 +0000
2647@@ -0,0 +1,8 @@
2648+#!/bin/sh -e
2649+
2650+if [ "$1" = "configure" ]; then
2651+ chown nova:nova /etc/nova/nova-compute.conf
2652+ chmod 0600 /etc/nova/nova-compute.conf
2653+fi
2654+
2655+#DEBHELPER#
2656
2657=== added file 'debian/nova-compute-lxc.postinst'
2658--- debian/nova-compute-lxc.postinst 1970-01-01 00:00:00 +0000
2659+++ debian/nova-compute-lxc.postinst 2012-05-25 10:20:02 +0000
2660@@ -0,0 +1,8 @@
2661+#!/bin/sh -e
2662+
2663+if [ "$1" = "configure" ]; then
2664+ chown nova:nova /etc/nova/nova-compute.conf
2665+ chmod 0600 /etc/nova/nova-compute.conf
2666+fi
2667+
2668+#DEBHELPER#
2669
2670=== added file 'debian/nova-compute-qemu.conf'
2671--- debian/nova-compute-qemu.conf 1970-01-01 00:00:00 +0000
2672+++ debian/nova-compute-qemu.conf 2012-05-25 10:20:02 +0000
2673@@ -0,0 +1,1 @@
2674+--libvirt_type=qemu
2675
2676=== added file 'debian/nova-compute-qemu.postinst'
2677--- debian/nova-compute-qemu.postinst 1970-01-01 00:00:00 +0000
2678+++ debian/nova-compute-qemu.postinst 2012-05-25 10:20:02 +0000
2679@@ -0,0 +1,8 @@
2680+#!/bin/sh -e
2681+
2682+if [ "$1" = "configure" ]; then
2683+ chown nova:nova /etc/nova/nova-compute.conf
2684+ chmod 0600 /etc/nova/nova-compute.conf
2685+fi
2686+
2687+#DEBHELPER#
2688
2689=== added file 'debian/nova-compute-uml.postinst'
2690--- debian/nova-compute-uml.postinst 1970-01-01 00:00:00 +0000
2691+++ debian/nova-compute-uml.postinst 2012-05-25 10:20:02 +0000
2692@@ -0,0 +1,8 @@
2693+#!/bin/sh -e
2694+
2695+if [ "$1" = "configure" ]; then
2696+ chown nova:nova /etc/nova/nova-compute.conf
2697+ chmod 0600 /etc/nova/nova-compute.conf
2698+fi
2699+
2700+#DEBHELPER#
2701
2702=== added file 'debian/nova-compute-xen.postinst'
2703--- debian/nova-compute-xen.postinst 1970-01-01 00:00:00 +0000
2704+++ debian/nova-compute-xen.postinst 2012-05-25 10:20:02 +0000
2705@@ -0,0 +1,8 @@
2706+#!/bin/sh -e
2707+
2708+if [ "$1" = "configure" ]; then
2709+ chown nova:nova /etc/nova/nova-compute.conf
2710+ chmod 0600 /etc/nova/nova-compute.conf
2711+fi
2712+
2713+#DEBHELPER#
2714
2715=== modified file 'debian/nova-compute.init'
2716--- debian/nova-compute.init 2011-08-11 13:29:06 +0000
2717+++ debian/nova-compute.init 2012-05-25 10:20:02 +0000
2718@@ -1,75 +1,100 @@
2719-#! /bin/sh
2720+#!/bin/sh
2721 ### BEGIN INIT INFO
2722 # Provides: nova-compute
2723-# Required-Start: $remote_fs $syslog
2724-# Required-Stop: $remote_fs $syslog
2725+# Required-Start: $network $local_fs $remote_fs $syslog
2726+# Required-Stop: $remote_fs
2727 # Should-Start: libvirt-bin
2728 # Should-Stop: libvirt-bin
2729 # Default-Start: 2 3 4 5
2730 # Default-Stop: 0 1 6
2731-# Short-Description: nova-compute server
2732-# Description: Provides compute server resources for the openstack
2733-# cloud computing system
2734+# Short-Description: Nova Compute server
2735+# Description: Provides compute server resources for the
2736+# OpenStack cloud computing system
2737 ### END INIT INFO
2738
2739-
2740-set -e
2741-
2742+# Author: Julien Danjou <acid@debian.org>
2743+
2744+# PATH should only include /usr/* if it runs after the mountnfs.sh script
2745+PATH=/sbin:/usr/sbin:/bin:/usr/bin
2746+DESC="OpenStack Compute"
2747+NAME=nova-compute
2748 DAEMON=/usr/bin/nova-compute
2749 DAEMON_ARGS="--flagfile=/etc/nova/nova.conf"
2750-PIDFILE=/var/run/nova/nova-compute.pid
2751-
2752-ENABLED=true
2753-
2754-if test -f /etc/default/nova-compute; then
2755- . /etc/default/nova-compute
2756-fi
2757-
2758-mkdir -p /var/run/nova
2759-chown nova:root /var/run/nova/
2760-
2761-mkdir -p /var/lock/nova
2762-chown nova:root /var/lock/nova/
2763-
2764-uid="$(getent passwd nova | cut -f3 -d:)"
2765-gid="$(getent passwd nova | cut -f4 -d:)"
2766+PIDFILE=/var/run/$NAME.pid
2767+SCRIPTNAME=/etc/init.d/$NAME
2768+NOVA_USER=nova
2769+LOCK_DIR=/var/lock/nova/
2770+
2771+# Exit if the package is not installed
2772+[ -x $DAEMON ] || exit 0
2773+
2774+mkdir -p ${LOCK_DIR}
2775+chown ${NOVA_USER} ${LOCK_DIR}
2776+
2777+# Read configuration variable file if it is present
2778+[ -r /etc/default/$NAME ] && . /etc/default/$NAME
2779
2780 . /lib/lsb/init-functions
2781
2782-export PATH="${PATH:+$PATH:}/usr/sbin:/sbin"
2783-export TMPDIR=/var/lib/nova/tmp
2784+do_start()
2785+{
2786+ start-stop-daemon --start --background --quiet --chuid ${NOVA_USER}:nova --make-pidfile --pidfile $PIDFILE --startas $DAEMON --test > /dev/null \
2787+ || return 1
2788+ start-stop-daemon --start --background --quiet --chuid ${NOVA_USER}:nova --make-pidfile --pidfile $PIDFILE --startas $DAEMON -- \
2789+ $DAEMON_ARGS \
2790+ || return 2
2791+}
2792
2793-if ! [ -x ${DAEMON} ] ; then
2794- exit 0
2795-fi
2796+do_stop()
2797+{
2798+ start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE
2799+ RETVAL="$?"
2800+ rm -f $PIDFILE
2801+ return "$RETVAL"
2802+}
2803
2804 case "$1" in
2805 start)
2806- test "$ENABLED" = "true" || exit 0
2807- log_daemon_msg "Starting nova compute" "nova-compute"
2808- start-stop-daemon --start --chdir /var/run --chuid ${uid}:${gid} -b -m --pidfile $PIDFILE --exec ${DAEMON} -- ${DAEMON_ARGS}
2809- log_end_msg $?
2810- ;;
2811+ log_daemon_msg "Starting $DESC " "$NAME"
2812+ do_start
2813+ case "$?" in
2814+ 0|1) log_end_msg 0 ;;
2815+ 2) log_end_msg 1 ;;
2816+ esac
2817+ ;;
2818 stop)
2819- test "$ENABLED" = "true" || exit 0
2820- log_daemon_msg "Stopping nova compute" "nova-compute"
2821- start-stop-daemon --stop --oknodo --pidfile ${PIDFILE}
2822- log_end_msg $?
2823- ;;
2824+ log_daemon_msg "Stopping $DESC" "$NAME"
2825+ do_stop
2826+ case "$?" in
2827+ 0|1) log_end_msg 0 ;;
2828+ 2) log_end_msg 1 ;;
2829+ esac
2830+ ;;
2831+ status)
2832+ status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
2833+ ;;
2834 restart|force-reload)
2835- test "$ENABLED" = "true" || exit 1
2836- $0 stop
2837- sleep 1
2838- $0 start
2839- ;;
2840- status)
2841- test "$ENABLED" = "true" || exit 0
2842- status_of_proc -p $PIDFILE $DAEMON nova-compute && exit 0 || exit $?
2843- ;;
2844+ log_daemon_msg "Restarting $DESC" "$NAME"
2845+ do_stop
2846+ case "$?" in
2847+ 0|1)
2848+ do_start
2849+ case "$?" in
2850+ 0) log_end_msg 0 ;;
2851+ 1) log_end_msg 1 ;; # Old process is still running
2852+ *) log_end_msg 1 ;; # Failed to start
2853+ esac
2854+ ;;
2855+ *)
2856+ # Failed to stop
2857+ log_end_msg 1
2858+ ;;
2859+ esac
2860+ ;;
2861 *)
2862- log_action_msg "Usage: /etc/init.d/nova-compute {start|stop|restart|force-reload|status}"
2863- exit 1
2864- ;;
2865+ echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
2866+ exit 3
2867+ ;;
2868 esac
2869
2870-exit 0
2871+:
2872
2873=== added file 'debian/nova-compute.pyinstall'
2874--- debian/nova-compute.pyinstall 1970-01-01 00:00:00 +0000
2875+++ debian/nova-compute.pyinstall 2012-05-25 10:20:02 +0000
2876@@ -0,0 +1,1 @@
2877+nova/rootwrap/compute.py
2878
2879=== modified file 'debian/nova-compute.upstart.in'
2880--- debian/nova-compute.upstart.in 2011-09-27 01:29:58 +0000
2881+++ debian/nova-compute.upstart.in 2012-05-25 10:20:02 +0000
2882@@ -17,4 +17,4 @@
2883 modprobe nbd
2884 end script
2885
2886-exec su -c "nova-compute --flagfile=/etc/nova/nova.conf --flagfile=/etc/nova/nova-compute.conf" nova
2887+exec su -s /bin/sh -c "exec nova-compute --flagfile=/etc/nova/nova.conf --flagfile=/etc/nova/nova-compute.conf" nova
2888
2889=== added file 'debian/nova-console.init'
2890--- debian/nova-console.init 1970-01-01 00:00:00 +0000
2891+++ debian/nova-console.init 2012-05-25 10:20:02 +0000
2892@@ -0,0 +1,97 @@
2893+#!/bin/sh
2894+### BEGIN INIT INFO
2895+# Provides: nova-console
2896+# Required-Start: $network $local_fs $remote_fs $syslog
2897+# Required-Stop: $remote_fs
2898+# Default-Start: 2 3 4 5
2899+# Default-Stop: 0 1 6
2900+# Short-Description: Nova Console for XenServer and XVP
2901+# Description: Nova Console for XenServer and XVP
2902+### END INIT INFO
2903+
2904+# Author: Julien Danjou <acid@debian.org>
2905+
2906+# PATH should only include /usr/* if it runs after the mountnfs.sh script
2907+PATH=/sbin:/usr/sbin:/bin:/usr/bin
2908+DESC="OpenStack Compute Console"
2909+NAME=nova-console
2910+DAEMON=/usr/bin/nova-console
2911+DAEMON_ARGS="--flagfile=/etc/nova/nova.conf"
2912+PIDFILE=/var/run/$NAME.pid
2913+SCRIPTNAME=/etc/init.d/$NAME
2914+NOVA_USER=nova
2915+LOCK_DIR=/var/lock/nova/
2916+
2917+# Exit if the package is not installed
2918+[ -x $DAEMON ] || exit 0
2919+
2920+mkdir -p ${LOCK_DIR}
2921+chown ${NOVA_USER} ${LOCK_DIR}
2922+
2923+# Read configuration variable file if it is present
2924+[ -r /etc/default/$NAME ] && . /etc/default/$NAME
2925+
2926+. /lib/lsb/init-functions
2927+
2928+do_start()
2929+{
2930+ start-stop-daemon --start --background --quiet --chuid ${NOVA_USER}:nova --make-pidfile --pidfile $PIDFILE --startas $DAEMON --test > /dev/null \
2931+ || return 1
2932+ start-stop-daemon --start --background --quiet --chuid ${NOVA_USER}:nova --make-pidfile --pidfile $PIDFILE --startas $DAEMON -- \
2933+ $DAEMON_ARGS \
2934+ || return 2
2935+}
2936+
2937+do_stop()
2938+{
2939+ start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE
2940+ RETVAL="$?"
2941+ rm -f $PIDFILE
2942+ return "$RETVAL"
2943+}
2944+
2945+case "$1" in
2946+ start)
2947+ log_daemon_msg "Starting $DESC " "$NAME"
2948+ do_start
2949+ case "$?" in
2950+ 0|1) log_end_msg 0 ;;
2951+ 2) log_end_msg 1 ;;
2952+ esac
2953+ ;;
2954+ stop)
2955+ log_daemon_msg "Stopping $DESC" "$NAME"
2956+ do_stop
2957+ case "$?" in
2958+ 0|1) log_end_msg 0 ;;
2959+ 2) log_end_msg 1 ;;
2960+ esac
2961+ ;;
2962+ status)
2963+ status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
2964+ ;;
2965+ restart|force-reload)
2966+ log_daemon_msg "Restarting $DESC" "$NAME"
2967+ do_stop
2968+ case "$?" in
2969+ 0|1)
2970+ do_start
2971+ case "$?" in
2972+ 0) log_end_msg 0 ;;
2973+ 1) log_end_msg 1 ;; # Old process is still running
2974+ *) log_end_msg 1 ;; # Failed to start
2975+ esac
2976+ ;;
2977+ *)
2978+ # Failed to stop
2979+ log_end_msg 1
2980+ ;;
2981+ esac
2982+ ;;
2983+ *)
2984+ echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
2985+ exit 3
2986+ ;;
2987+esac
2988+
2989+:
2990
2991=== added file 'debian/nova-console.install'
2992--- debian/nova-console.install 1970-01-01 00:00:00 +0000
2993+++ debian/nova-console.install 2012-05-25 10:20:02 +0000
2994@@ -0,0 +1,1 @@
2995+usr/bin/nova-console
2996
2997=== added file 'debian/nova-console.logrotate'
2998--- debian/nova-console.logrotate 1970-01-01 00:00:00 +0000
2999+++ debian/nova-console.logrotate 2012-05-25 10:20:02 +0000
3000@@ -0,0 +1,5 @@
3001+/var/log/nova/nova-console.log {
3002+ daily
3003+ copytruncate
3004+ missingok
3005+}
3006
3007=== added file 'debian/nova-console.manpages'
3008--- debian/nova-console.manpages 1970-01-01 00:00:00 +0000
3009+++ debian/nova-console.manpages 2012-05-25 10:20:02 +0000
3010@@ -0,0 +1,1 @@
3011+debian/mans/nova-console.8
3012
3013=== added file 'debian/nova-console.upstart.in'
3014--- debian/nova-console.upstart.in 1970-01-01 00:00:00 +0000
3015+++ debian/nova-console.upstart.in 2012-05-25 10:20:02 +0000
3016@@ -0,0 +1,19 @@
3017+description "Nova Console"
3018+author "Vishvananda Ishaya <vishvananda@gmail.com>"
3019+
3020+start on (filesystem and net-device-up IFACE!=lo)
3021+stop on runlevel [016]
3022+
3023+respawn
3024+
3025+chdir /var/run
3026+
3027+pre-start script
3028+ mkdir -p /var/run/nova
3029+ chown nova:root /var/run/nova
3030+
3031+ mkdir -p /var/lock/nova
3032+ chown nova:root /var/lock/nova
3033+end script
3034+
3035+exec su -s /bin/sh -c "exec nova-console --flagfile=/etc/nova/nova.conf" nova
3036
3037=== added file 'debian/nova-consoleauth.init'
3038--- debian/nova-consoleauth.init 1970-01-01 00:00:00 +0000
3039+++ debian/nova-consoleauth.init 2012-05-25 10:20:02 +0000
3040@@ -0,0 +1,97 @@
3041+#!/bin/sh
3042+### BEGIN INIT INFO
3043+# Provides: nova-console
3044+# Required-Start: $network $local_fs $remote_fs $syslog
3045+# Required-Stop: $remote_fs
3046+# Default-Start: 2 3 4 5
3047+# Default-Stop: 0 1 6
3048+# Short-Description: Nova Console for XenServer and XVP
3049+# Description: Nova Console for XenServer and XVP
3050+### END INIT INFO
3051+
3052+# Author: Julien Danjou <acid@debian.org>
3053+
3054+# PATH should only include /usr/* if it runs after the mountnfs.sh script
3055+PATH=/sbin:/usr/sbin:/bin:/usr/bin
3056+DESC="OpenStack Compute Console"
3057+NAME=nova-consoleauth
3058+DAEMON=/usr/bin/nova-consoleauth
3059+DAEMON_ARGS="--flagfile=/etc/nova/nova.conf"
3060+PIDFILE=/var/run/$NAME.pid
3061+SCRIPTNAME=/etc/init.d/$NAME
3062+NOVA_USER=nova
3063+LOCK_DIR=/var/lock/nova/
3064+
3065+# Exit if the package is not installed
3066+[ -x $DAEMON ] || exit 0
3067+
3068+mkdir -p ${LOCK_DIR}
3069+chown ${NOVA_USER} ${LOCK_DIR}
3070+
3071+# Read configuration variable file if it is present
3072+[ -r /etc/default/$NAME ] && . /etc/default/$NAME
3073+
3074+. /lib/lsb/init-functions
3075+
3076+do_start()
3077+{
3078+ start-stop-daemon --start --background --quiet --chuid ${NOVA_USER}:nova --make-pidfile --pidfile $PIDFILE --startas $DAEMON --test > /dev/null \
3079+ || return 1
3080+ start-stop-daemon --start --background --quiet --chuid ${NOVA_USER}:nova --make-pidfile --pidfile $PIDFILE --startas $DAEMON -- \
3081+ $DAEMON_ARGS \
3082+ || return 2
3083+}
3084+
3085+do_stop()
3086+{
3087+ start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE
3088+ RETVAL="$?"
3089+ rm -f $PIDFILE
3090+ return "$RETVAL"
3091+}
3092+
3093+case "$1" in
3094+ start)
3095+ log_daemon_msg "Starting $DESC " "$NAME"
3096+ do_start
3097+ case "$?" in
3098+ 0|1) log_end_msg 0 ;;
3099+ 2) log_end_msg 1 ;;
3100+ esac
3101+ ;;
3102+ stop)
3103+ log_daemon_msg "Stopping $DESC" "$NAME"
3104+ do_stop
3105+ case "$?" in
3106+ 0|1) log_end_msg 0 ;;
3107+ 2) log_end_msg 1 ;;
3108+ esac
3109+ ;;
3110+ status)
3111+ status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
3112+ ;;
3113+ restart|force-reload)
3114+ log_daemon_msg "Restarting $DESC" "$NAME"
3115+ do_stop
3116+ case "$?" in
3117+ 0|1)
3118+ do_start
3119+ case "$?" in
3120+ 0) log_end_msg 0 ;;
3121+ 1) log_end_msg 1 ;; # Old process is still running
3122+ *) log_end_msg 1 ;; # Failed to start
3123+ esac
3124+ ;;
3125+ *)
3126+ # Failed to stop
3127+ log_end_msg 1
3128+ ;;
3129+ esac
3130+ ;;
3131+ *)
3132+ echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
3133+ exit 3
3134+ ;;
3135+esac
3136+
3137+:
3138
3139=== added file 'debian/nova-consoleauth.install'
3140--- debian/nova-consoleauth.install 1970-01-01 00:00:00 +0000
3141+++ debian/nova-consoleauth.install 2012-05-25 10:20:02 +0000
3142@@ -0,0 +1,1 @@
3143+usr/bin/nova-consoleauth
3144
3145=== added file 'debian/nova-consoleauth.logrotate'
3146--- debian/nova-consoleauth.logrotate 1970-01-01 00:00:00 +0000
3147+++ debian/nova-consoleauth.logrotate 2012-05-25 10:20:02 +0000
3148@@ -0,0 +1,5 @@
3149+/var/log/nova/nova-consoleauth.log {
3150+ daily
3151+ copytruncate
3152+ missingok
3153+}
3154
3155=== added file 'debian/nova-consoleauth.manpages'
3156--- debian/nova-consoleauth.manpages 1970-01-01 00:00:00 +0000
3157+++ debian/nova-consoleauth.manpages 2012-05-25 10:20:02 +0000
3158@@ -0,0 +1,1 @@
3159+debian/mans/nova-consoleauth.8
3160
3161=== added file 'debian/nova-consoleauth.upstart.in'
3162--- debian/nova-consoleauth.upstart.in 1970-01-01 00:00:00 +0000
3163+++ debian/nova-consoleauth.upstart.in 2012-05-25 10:20:02 +0000
3164@@ -0,0 +1,19 @@
3165+description "Nova Console"
3166+author "Vishvananda Ishaya <vishvananda@gmail.com>"
3167+
3168+start on (filesystem and net-device-up IFACE!=lo)
3169+stop on runlevel [016]
3170+
3171+respawn
3172+
3173+chdir /var/run
3174+
3175+pre-start script
3176+ mkdir -p /var/run/nova
3177+ chown nova:root /var/run/nova
3178+
3179+ mkdir -p /var/lock/nova
3180+ chown nova:root /var/lock/nova
3181+end script
3182+
3183+exec su -s /bin/sh -c "exec nova-consoleauth --flagfile=/etc/nova/nova.conf" nova
3184
3185=== modified file 'debian/nova-doc.docs'
3186--- debian/nova-doc.docs 2011-04-08 14:48:40 +0000
3187+++ debian/nova-doc.docs 2012-05-25 10:20:02 +0000
3188@@ -1,1 +1,1 @@
3189-doc/doc/build/html
3190+doc/build/html
3191
3192=== added file 'debian/nova-doc.links'
3193--- debian/nova-doc.links 1970-01-01 00:00:00 +0000
3194+++ debian/nova-doc.links 2012-05-25 10:20:02 +0000
3195@@ -0,0 +1,7 @@
3196+# Overwrite jquery.js from upstream tarball with a link to jquery.js
3197+# provided by jQuery Debian package
3198+/usr/share/javascript/jquery/jquery.js usr/share/doc/nova-doc/html/_static/jquery.js
3199+
3200+# Overwrite underscore.js from upstream tarball with a link to underscore.min.js
3201+# provided by Underscore Debian package
3202+/usr/share/javascript/underscore/underscore.min.js usr/share/doc/nova-doc/html/_static/underscore.js
3203
3204=== modified file 'debian/nova-network.init'
3205--- debian/nova-network.init 2011-08-11 11:27:36 +0000
3206+++ debian/nova-network.init 2012-05-25 10:20:02 +0000
3207@@ -1,71 +1,97 @@
3208-#! /bin/sh
3209+#!/bin/sh
3210 ### BEGIN INIT INFO
3211 # Provides: nova-network
3212-# Required-Start: $remote_fs $syslog
3213-# Required-Stop: $remote_fs $syslog
3214+# Required-Start: $network $local_fs $remote_fs $syslog
3215+# Required-Stop: $remote_fs
3216 # Default-Start: 2 3 4 5
3217 # Default-Stop: 0 1 6
3218-# Short-Description: nova-network
3219-# Description: Provides network ressources (connectivity and IP addresses)
3220+# Short-Description: Nova Network
3221+# Description: Provides network resources
3222 ### END INIT INFO
3223
3224-
3225-set -e
3226-
3227+# Author: Julien Danjou <acid@debian.org>
3228+
3229+# PATH should only include /usr/* if it runs after the mountnfs.sh script
3230+PATH=/sbin:/usr/sbin:/bin:/usr/bin
3231+DESC="OpenStack Compute Network"
3232+NAME=nova-network
3233 DAEMON=/usr/bin/nova-network
3234 DAEMON_ARGS="--flagfile=/etc/nova/nova.conf"
3235-PIDFILE=/var/run/nova/nova-network.pid
3236-
3237-ENABLED=true
3238-
3239-if test -f /etc/default/nova-network; then
3240- . /etc/default/nova-network
3241-fi
3242-
3243-mkdir -p /var/run/nova
3244-chown nova:root /var/run/nova/
3245-
3246-mkdir -p /var/lock/nova
3247-chown nova:root /var/lock/nova/
3248-
3249-uid="$(getent passwd nova | cut -f3 -d:)"
3250-gid="$(getent passwd nova | cut -f4 -d:)"
3251+PIDFILE=/var/run/$NAME.pid
3252+SCRIPTNAME=/etc/init.d/$NAME
3253+NOVA_USER=nova
3254+LOCK_DIR=/var/lock/nova/
3255+
3256+# Exit if the package is not installed
3257+[ -x $DAEMON ] || exit 0
3258+
3259+mkdir -p ${LOCK_DIR}
3260+chown ${NOVA_USER} ${LOCK_DIR}
3261+
3262+# Read configuration variable file if it is present
3263+[ -r /etc/default/$NAME ] && . /etc/default/$NAME
3264
3265 . /lib/lsb/init-functions
3266
3267-export PATH="${PATH:+$PATH:}/usr/sbin:/sbin"
3268+do_start()
3269+{
3270+ start-stop-daemon --start --quiet --background --chuid ${NOVA_USER}:nova --make-pidfile --pidfile $PIDFILE --startas $DAEMON --test > /dev/null \
3271+ || return 1
3272+ start-stop-daemon --start --quiet --background --chuid ${NOVA_USER}:nova --make-pidfile --pidfile $PIDFILE --startas $DAEMON -- \
3273+ $DAEMON_ARGS \
3274+ || return 2
3275+}
3276
3277-if ! [ -x ${DAEMON} ] ; then
3278- exit 0
3279-fi
3280+do_stop()
3281+{
3282+ start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE
3283+ RETVAL="$?"
3284+ rm -f $PIDFILE
3285+ return "$RETVAL"
3286+}
3287
3288 case "$1" in
3289 start)
3290- test "$ENABLED" = "true" || exit 0
3291- log_daemon_msg "Starting nova network" "nova-network"
3292- start-stop-daemon --start --chdir /var/run --chuid ${uid}:${gid} --pidfile ${PIDFILE} -b -m --exec ${DAEMON} -- ${DAEMON_ARGS}
3293- log_end_msg $?
3294- ;;
3295+ log_daemon_msg "Starting $DESC " "$NAME"
3296+ do_start
3297+ case "$?" in
3298+ 0|1) log_end_msg 0 ;;
3299+ 2) log_end_msg 1 ;;
3300+ esac
3301+ ;;
3302 stop)
3303- test "$ENABLED" = "true" || exit 0
3304- log_daemon_msg "Stopping nova network" "nova-network"
3305- start-stop-daemon --stop --oknodo --pidfile ${PIDFILE}
3306- log_end_msg $?
3307- ;;
3308+ log_daemon_msg "Stopping $DESC" "$NAME"
3309+ do_stop
3310+ case "$?" in
3311+ 0|1) log_end_msg 0 ;;
3312+ 2) log_end_msg 1 ;;
3313+ esac
3314+ ;;
3315+ status)
3316+ status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
3317+ ;;
3318 restart|force-reload)
3319- test "$ENABLED" = "true" || exit 1
3320- $0 stop
3321- sleep 1
3322- $0 start
3323- ;;
3324- status)
3325- test "$ENABLED" = "true" || exit 0
3326- status_of_proc -p $PIDFILE $DAEMON nova-network && exit 0 || exit $?
3327- ;;
3328+ log_daemon_msg "Restarting $DESC" "$NAME"
3329+ do_stop
3330+ case "$?" in
3331+ 0|1)
3332+ do_start
3333+ case "$?" in
3334+ 0) log_end_msg 0 ;;
3335+ 1) log_end_msg 1 ;; # Old process is still running
3336+ *) log_end_msg 1 ;; # Failed to start
3337+ esac
3338+ ;;
3339+ *)
3340+ # Failed to stop
3341+ log_end_msg 1
3342+ ;;
3343+ esac
3344+ ;;
3345 *)
3346- log_action_msg "Usage: /etc/init.d/nova-network {start|stop|restart|force-reload|status}"
3347- exit 1
3348- ;;
3349+ echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
3350+ exit 3
3351+ ;;
3352 esac
3353
3354-exit 0
3355+:
3356
3357=== added file 'debian/nova-network.nova-dhcpbridge.logrotate'
3358--- debian/nova-network.nova-dhcpbridge.logrotate 1970-01-01 00:00:00 +0000
3359+++ debian/nova-network.nova-dhcpbridge.logrotate 2012-05-25 10:20:02 +0000
3360@@ -0,0 +1,4 @@
3361+/var/log/nova/nova-dhcpbridge.log {
3362+ daily
3363+ missingok
3364+}
3365
3366=== added file 'debian/nova-network.pyinstall'
3367--- debian/nova-network.pyinstall 1970-01-01 00:00:00 +0000
3368+++ debian/nova-network.pyinstall 2012-05-25 10:20:02 +0000
3369@@ -0,0 +1,1 @@
3370+nova/rootwrap/network.py
3371
3372=== modified file 'debian/nova-network.upstart.in'
3373--- debian/nova-network.upstart.in 2011-08-11 13:29:06 +0000
3374+++ debian/nova-network.upstart.in 2012-05-25 10:20:02 +0000
3375@@ -14,4 +14,4 @@
3376 chown nova:root /var/lock/nova/
3377 end script
3378
3379-exec su -c "nova-network --flagfile=/etc/nova/nova.conf" nova
3380+exec su -s /bin/sh -c "exec nova-network --flagfile=/etc/nova/nova.conf" nova
3381
3382=== modified file 'debian/nova-objectstore.init'
3383--- debian/nova-objectstore.init 2011-08-11 11:27:36 +0000
3384+++ debian/nova-objectstore.init 2012-05-25 10:20:02 +0000
3385@@ -1,71 +1,97 @@
3386-#! /bin/sh
3387+#!/bin/sh
3388 ### BEGIN INIT INFO
3389 # Provides: nova-objectstore
3390-# Required-Start: $remote_fs $syslog
3391-# Required-Stop: $remote_fs $syslog
3392+# Required-Start: $network $local_fs $remote_fs $syslog
3393+# Required-Stop: $remote_fs
3394 # Default-Start: 2 3 4 5
3395 # Default-Stop: 0 1 6
3396-# Short-Description: nova-objectstore
3397-# Description: provides virtual machine storage functionalities
3398+# Short-Description: Nova Objectstore
3399+# Description: Provides virtual machine storage functionalities
3400 ### END INIT INFO
3401
3402-
3403-set -e
3404-
3405+# Author: Julien Danjou <acid@debian.org>
3406+
3407+# PATH should only include /usr/* if it runs after the mountnfs.sh script
3408+PATH=/sbin:/usr/sbin:/bin:/usr/bin
3409+DESC="OpenStack Compute Objectstore"
3410+NAME=nova-objectstore
3411 DAEMON=/usr/bin/nova-objectstore
3412 DAEMON_ARGS="--flagfile=/etc/nova/nova.conf"
3413-PIDFILE=/var/run/nova/nova-objectstore.pid
3414-
3415-ENABLED=true
3416-
3417-if test -f /etc/default/nova-objectstore; then
3418- . /etc/default/nova-objectstore
3419-fi
3420-
3421-mkdir -p /var/run/nova
3422-chown nova:root /var/run/nova/
3423-
3424-mkdir -p /var/lock/nova
3425-chown nova:root /var/lock/nova/
3426-
3427-uid="$(getent passwd nova | cut -f3 -d:)"
3428-gid="$(getent passwd nova | cut -f4 -d:)"
3429+PIDFILE=/var/run/$NAME.pid
3430+SCRIPTNAME=/etc/init.d/$NAME
3431+NOVA_USER=nova
3432+LOCK_DIR=/var/lock/nova/
3433+
3434+# Exit if the package is not installed
3435+[ -x $DAEMON ] || exit 0
3436+
3437+mkdir -p ${LOCK_DIR}
3438+chown ${NOVA_USER} ${LOCK_DIR}
3439+
3440+# Read configuration variable file if it is present
3441+[ -r /etc/default/$NAME ] && . /etc/default/$NAME
3442
3443 . /lib/lsb/init-functions
3444
3445-export PATH="${PATH:+$PATH:}/usr/sbin:/sbin"
3446+do_start()
3447+{
3448+ start-stop-daemon --start --quiet --background --chuid ${NOVA_USER}:nova --make-pidfile --pidfile $PIDFILE --startas $DAEMON --test > /dev/null \
3449+ || return 1
3450+ start-stop-daemon --start --quiet --background --chuid ${NOVA_USER}:nova --make-pidfile --pidfile $PIDFILE --startas $DAEMON -- \
3451+ $DAEMON_ARGS \
3452+ || return 2
3453+}
3454
3455-if ! [ -x ${DAEMON} ] ; then
3456- exit 0
3457-fi
3458+do_stop()
3459+{
3460+ start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE
3461+ RETVAL="$?"
3462+ rm -f $PIDFILE
3463+ return "$RETVAL"
3464+}
3465
3466 case "$1" in
3467 start)
3468- test "$ENABLED" = "true" || exit 0
3469- log_daemon_msg "Starting nova objectstore" "nova-objectstore"
3470- start-stop-daemon --start --chdir /var/run --chuid ${uid}:${gid} -b -m --pidfile ${PIDFILE} --exec ${DAEMON} -- ${DAEMON_ARGS}
3471- log_end_msg $?
3472- ;;
3473+ log_daemon_msg "Starting $DESC " "$NAME"
3474+ do_start
3475+ case "$?" in
3476+ 0|1) log_end_msg 0 ;;
3477+ 2) log_end_msg 1 ;;
3478+ esac
3479+ ;;
3480 stop)
3481- test "$ENABLED" = "true" || exit 0
3482- log_daemon_msg "Stopping nova objectstore" "nova-objectstore"
3483- start-stop-daemon --stop --oknodo --pidfile ${PIDFILE}
3484- log_end_msg $?
3485- ;;
3486+ log_daemon_msg "Stopping $DESC" "$NAME"
3487+ do_stop
3488+ case "$?" in
3489+ 0|1) log_end_msg 0 ;;
3490+ 2) log_end_msg 1 ;;
3491+ esac
3492+ ;;
3493+ status)
3494+ status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
3495+ ;;
3496 restart|force-reload)
3497- test "$ENABLED" = "true" || exit 1
3498- $0 stop
3499- sleep 1
3500- $0 start
3501- ;;
3502- status)
3503- test "$ENABLED" = "true" || exit 0
3504- status_of_proc -p $PIDFILE $DAEMON nova-objectstore && exit 0 || exit $?
3505- ;;
3506+ log_daemon_msg "Restarting $DESC" "$NAME"
3507+ do_stop
3508+ case "$?" in
3509+ 0|1)
3510+ do_start
3511+ case "$?" in
3512+ 0) log_end_msg 0 ;;
3513+ 1) log_end_msg 1 ;; # Old process is still running
3514+ *) log_end_msg 1 ;; # Failed to start
3515+ esac
3516+ ;;
3517+ *)
3518+ # Failed to stop
3519+ log_end_msg 1
3520+ ;;
3521+ esac
3522+ ;;
3523 *)
3524- log_action_msg "Usage: /etc/init.d/nova-objectstore {start|stop|restart|force-reload|status}"
3525- exit 1
3526- ;;
3527+ echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
3528+ exit 3
3529+ ;;
3530 esac
3531
3532-exit 0
3533+:
3534
3535=== modified file 'debian/nova-objectstore.logrotate'
3536--- debian/nova-objectstore.logrotate 2011-04-29 18:29:55 +0000
3537+++ debian/nova-objectstore.logrotate 2012-05-25 10:20:02 +0000
3538@@ -2,10 +2,6 @@
3539 daily
3540 missingok
3541 postrotate
3542- if dpkg-vendor --derives-from ubuntu ; then
3543- restart nova-objectstore
3544- else
3545- invoke-rc.d nova-objectstore restart 2>&1 >/dev/null
3546- fi
3547+ restart nova-objectstore
3548 endscript
3549 }
3550
3551=== modified file 'debian/nova-objectstore.upstart.in'
3552--- debian/nova-objectstore.upstart.in 2011-08-23 13:03:24 +0000
3553+++ debian/nova-objectstore.upstart.in 2012-05-25 10:20:02 +0000
3554@@ -14,4 +14,4 @@
3555 chown nova:root /var/lock/nova/
3556 end script
3557
3558-exec su -c "nova-objectstore --flagfile=/etc/nova/nova.conf" nova
3559+exec su -s /bin/sh -c "exec nova-objectstore --flagfile=/etc/nova/nova.conf" nova
3560
3561=== modified file 'debian/nova-scheduler.init'
3562--- debian/nova-scheduler.init 2011-08-11 11:27:36 +0000
3563+++ debian/nova-scheduler.init 2012-05-25 10:20:02 +0000
3564@@ -1,71 +1,97 @@
3565-#! /bin/sh
3566+#!/bin/sh
3567 ### BEGIN INIT INFO
3568 # Provides: nova-scheduler
3569-# Required-Start: $remote_fs $syslog
3570-# Required-Stop: $remote_fs $syslog
3571+# Required-Start: $network $local_fs $remote_fs $syslog
3572+# Required-Stop: $remote_fs
3573 # Default-Start: 2 3 4 5
3574 # Default-Stop: 0 1 6
3575-# Short-Description: nova-scheduler
3576+# Short-Description: Nova Scheduler
3577 # Description: Schedules instances, volumes, etc. for Nova
3578 ### END INIT INFO
3579
3580-
3581-set -e
3582-
3583+# Author: Julien Danjou <acid@debian.org>
3584+
3585+# PATH should only include /usr/* if it runs after the mountnfs.sh script
3586+PATH=/sbin:/usr/sbin:/bin:/usr/bin
3587+DESC="OpenStack Compute Scheduler"
3588+NAME=nova-scheduler
3589 DAEMON=/usr/bin/nova-scheduler
3590 DAEMON_ARGS="--flagfile=/etc/nova/nova.conf"
3591-PIDFILE=/var/run/nova/nova-scheduler.pid
3592-
3593-ENABLED=true
3594-
3595-if test -f /etc/default/nova-scheduler; then
3596- . /etc/default/nova-scheduler
3597-fi
3598-
3599-mkdir -p /var/run/nova
3600-chown nova:root /var/run/nova/
3601-
3602-mkdir -p /var/lock/nova
3603-chown nova:root /var/lock/nova/
3604-
3605-uid="$(getent passwd nova | cut -f3 -d:)"
3606-gid="$(getent passwd nova | cut -f4 -d:)"
3607+PIDFILE=/var/run/$NAME.pid
3608+SCRIPTNAME=/etc/init.d/$NAME
3609+NOVA_USER=nova
3610+LOCK_DIR=/var/lock/nova/
3611+
3612+# Exit if the package is not installed
3613+[ -x $DAEMON ] || exit 0
3614+
3615+mkdir -p ${LOCK_DIR}
3616+chown ${NOVA_USER} ${LOCK_DIR}
3617+
3618+# Read configuration variable file if it is present
3619+[ -r /etc/default/$NAME ] && . /etc/default/$NAME
3620
3621 . /lib/lsb/init-functions
3622
3623-export PATH="${PATH:+$PATH:}/usr/sbin:/sbin"
3624+do_start()
3625+{
3626+ start-stop-daemon --start --quiet --background --chuid ${NOVA_USER}:nova --make-pidfile --pidfile $PIDFILE --startas $DAEMON --test > /dev/null \
3627+ || return 1
3628+ start-stop-daemon --start --quiet --background --chuid ${NOVA_USER}:nova --make-pidfile --pidfile $PIDFILE --startas $DAEMON -- \
3629+ $DAEMON_ARGS \
3630+ || return 2
3631+}
3632
3633-if ! [ -x ${DAEMON} ] ; then
3634- exit 0
3635-fi
3636+do_stop()
3637+{
3638+ start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE
3639+ RETVAL="$?"
3640+ rm -f $PIDFILE
3641+ return "$RETVAL"
3642+}
3643
3644 case "$1" in
3645 start)
3646- test "$ENABLED" = "true" || exit 0
3647- log_daemon_msg "Starting nova scheduler" "nova-scheduler"
3648- start-stop-daemon --start --chdir /var/run --chuid ${uid}:${gid} -b -m --pidfile ${PIDFILE} --exec ${DAEMON} -- ${DAEMON_ARGS}
3649- log_end_msg $?
3650- ;;
3651+ log_daemon_msg "Starting $DESC " "$NAME"
3652+ do_start
3653+ case "$?" in
3654+ 0|1) log_end_msg 0 ;;
3655+ 2) log_end_msg 1 ;;
3656+ esac
3657+ ;;
3658 stop)
3659- test "$ENABLED" = "true" || exit 0
3660- log_daemon_msg "Stopping nova scheduler" "nova-scheduler"
3661- start-stop-daemon --stop --oknodo --pidfile ${PIDFILE}
3662- log_end_msg $?
3663- ;;
3664+ log_daemon_msg "Stopping $DESC" "$NAME"
3665+ do_stop
3666+ case "$?" in
3667+ 0|1) log_end_msg 0 ;;
3668+ 2) log_end_msg 1 ;;
3669+ esac
3670+ ;;
3671+ status)
3672+ status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
3673+ ;;
3674 restart|force-reload)
3675- test "$ENABLED" = "true" || exit 1
3676- $0 stop
3677- sleep 1
3678- $0 start
3679- ;;
3680- status)
3681- test "$ENABLED" = "true" || exit 0
3682- status_of_proc -p $PIDFILE $DAEMON nova-scheduler && exit 0 || exit $?
3683- ;;
3684+ log_daemon_msg "Restarting $DESC" "$NAME"
3685+ do_stop
3686+ case "$?" in
3687+ 0|1)
3688+ do_start
3689+ case "$?" in
3690+ 0) log_end_msg 0 ;;
3691+ 1) log_end_msg 1 ;; # Old process is still running
3692+ *) log_end_msg 1 ;; # Failed to start
3693+ esac
3694+ ;;
3695+ *)
3696+ # Failed to stop
3697+ log_end_msg 1
3698+ ;;
3699+ esac
3700+ ;;
3701 *)
3702- log_action_msg "Usage: /etc/init.d/nova-scheduler {start|stop|restart|force-reload|status}"
3703- exit 1
3704- ;;
3705+ echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
3706+ exit 3
3707+ ;;
3708 esac
3709
3710-exit 0
3711+:
3712
3713=== modified file 'debian/nova-scheduler.upstart.in'
3714--- debian/nova-scheduler.upstart.in 2011-08-11 13:29:06 +0000
3715+++ debian/nova-scheduler.upstart.in 2012-05-25 10:20:02 +0000
3716@@ -15,4 +15,4 @@
3717 chown nova:root /var/lock/nova/
3718 end script
3719
3720-exec su -c "nova-scheduler --flagfile=/etc/nova/nova.conf" nova
3721+exec su -s /bin/sh -c "exec nova-scheduler --flagfile=/etc/nova/nova.conf" nova
3722
3723=== modified file 'debian/nova-vncproxy.install'
3724--- debian/nova-vncproxy.install 2011-04-22 20:28:57 +0000
3725+++ debian/nova-vncproxy.install 2012-05-25 10:20:02 +0000
3726@@ -1,1 +1,1 @@
3727-usr/bin/nova-vncproxy
3728+usr/bin/nova-xvpvncproxy
3729
3730=== modified file 'debian/nova-vncproxy.upstart.in'
3731--- debian/nova-vncproxy.upstart.in 2011-08-11 13:29:06 +0000
3732+++ debian/nova-vncproxy.upstart.in 2012-05-25 10:20:02 +0000
3733@@ -15,4 +15,4 @@
3734 chown nova:root /var/lock/nova/
3735 end script
3736
3737-exec su -c "nova-vncproxy --flagfile=/etc/nova/nova.conf" nova
3738+exec su -s /bin/sh -c "exec nova-xvpvncproxy --flagfile=/etc/nova/nova.conf" nova
3739
3740=== modified file 'debian/nova-volume.default'
3741--- debian/nova-volume.default 2011-04-14 05:53:27 +0000
3742+++ debian/nova-volume.default 2012-05-25 10:20:02 +0000
3743@@ -1,5 +1,4 @@
3744 # nova-volume default vg to use.
3745 # If nothing is set here, then nova-volume will pickup the
3746-# first volume group it sees using the following command:
3747-# vgdisplay -c -A | tail -n 1 | cut -d":" -f1 | awk '{print $1}'
3748-#nova_volume_group=
3749+# first volume group it sees.
3750+#nova_volume_group=
3751\ No newline at end of file
3752
3753=== modified file 'debian/nova-volume.init'
3754--- debian/nova-volume.init 2011-08-11 11:27:36 +0000
3755+++ debian/nova-volume.init 2012-05-25 10:20:02 +0000
3756@@ -1,79 +1,111 @@
3757-#! /bin/sh
3758+#!/bin/sh
3759 ### BEGIN INIT INFO
3760 # Provides: nova-volume
3761-# Required-Start: $remote_fs $syslog
3762-# Required-Stop: $remote_fs $syslog
3763+# Required-Start: $network $local_fs $remote_fs $syslog
3764+# Required-Stop: $remote_fs
3765 # Default-Start: 2 3 4 5
3766 # Default-Stop: 0 1 6
3767-# Short-Description: nova-volume
3768-# Description: provides EBS like storage for your virtual machine instances
3769+# Short-Description: Nova Volume
3770+# Description: Provides EBS like storage for your
3771+# virtual machine instances
3772 ### END INIT INFO
3773
3774-set -e
3775+# Author: Julien Danjou <acid@debian.org>
3776
3777+# PATH should only include /usr/* if it runs after the mountnfs.sh script
3778+PATH=/sbin:/usr/sbin:/bin:/usr/bin
3779+DESC="OpenStack Compute Volume"
3780+NAME=nova-volume
3781 DAEMON=/usr/bin/nova-volume
3782 DAEMON_ARGS="--flagfile=/etc/nova/nova.conf"
3783-PIDFILE=/var/run/nova/nova-volume.pid
3784-
3785-ENABLED=true
3786-
3787-# Guess the VG by getting the first one we see in "vgdisplay -c -A"
3788-# if nothing was set in the default file
3789-VGDISPLAY=/sbin/vgdisplay
3790-if [ -f /etc/default/nova-volume ] ; then
3791- . /etc/default/nova-volume
3792-fi
3793-if [ -x "${VGDISPLAY}" -a -z "${nova_volume_group}" ] ; then
3794- nova_volume_group=`vgdisplay -c -A | tail -n 1 | cut -d":" -f1 | awk '{print $1}'`
3795-fi
3796-
3797-mkdir -p /var/run/nova
3798-chown nova:root /var/run/nova/
3799-
3800-mkdir -p /var/lock/nova
3801-chown nova:root /var/lock/nova/
3802-
3803-uid="$(getent passwd nova | cut -f3 -d:)"
3804-gid="$(getent passwd nova | cut -f4 -d:)"
3805-
3806-# Adds what has been configured in /etc/default/nova-volume
3807-if [ -n ${nova_volume_group} ] ; then
3808- DAEMON_ARGS="${DAEMON_ARGS} --volume_group=${nova_volume_group}"
3809-fi
3810+PIDFILE=/var/run/$NAME.pid
3811+SCRIPTNAME=/etc/init.d/$NAME
3812+NOVA_USER=nova
3813+LOCK_DIR=/var/lock/nova/
3814+
3815+# Exit if the package is not installed
3816+[ -x $DAEMON ] || exit 0
3817+
3818+mkdir -p ${LOCK_DIR}
3819+chown ${NOVA_USER} ${LOCK_DIR}
3820+
3821+# Read configuration variable file if it is present
3822+[ -r /etc/default/$NAME ] && . /etc/default/$NAME
3823
3824 . /lib/lsb/init-functions
3825
3826-if ! [ -x ${DAEMON} ] ; then
3827- exit 0
3828-fi
3829+do_start()
3830+{
3831+ # Guess the VG by getting the first one we see in "vgdisplay -c -A"
3832+ # if nothing was set in the default file
3833+ VGDISPLAY=/sbin/vgdisplay
3834+ if [ -z "${nova_volume_group}" -a -x "$VGDISPLAY" ]
3835+ then
3836+ nova_volume_group=`$VGDISPLAY -c -A | head -n 1 | cut -d":" -f1 | awk '{print $1}'`
3837+ fi
3838+
3839+ # Adds what has been configured in /etc/default/nova-volume
3840+ if [ -n ${nova_volume_group} ] ; then
3841+ DAEMON_ARGS="${DAEMON_ARGS} --volume_group=${nova_volume_group}"
3842+ fi
3843+
3844+ start-stop-daemon --start --quiet --background --chuid ${NOVA_USER}:nova --make-pidfile --pidfile $PIDFILE --startas $DAEMON --test > /dev/null \
3845+ || return 1
3846+ start-stop-daemon --start --quiet --background --chuid ${NOVA_USER}:nova --make-pidfile --pidfile $PIDFILE --startas $DAEMON -- \
3847+ $DAEMON_ARGS \
3848+ || return 2
3849+}
3850+
3851+do_stop()
3852+{
3853+ start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE
3854+ RETVAL="$?"
3855+ rm -f $PIDFILE
3856+ return "$RETVAL"
3857+}
3858
3859 case "$1" in
3860 start)
3861- test "$ENABLED" = "true" || exit 0
3862- log_daemon_msg "Starting nova volume" "nova-volume"
3863- start-stop-daemon --start --chdir /var/run --chuid ${uid}:${gid} -b -m --pidfile ${PIDFILE} --exec ${DAEMON} -- ${DAEMON_ARGS}
3864- log_end_msg $?
3865- ;;
3866+ log_daemon_msg "Starting $DESC " "$NAME"
3867+ do_start
3868+ case "$?" in
3869+ 0|1) log_end_msg 0 ;;
3870+ 2) log_end_msg 1 ;;
3871+ esac
3872+ ;;
3873 stop)
3874- test "$ENABLED" = "true" || exit 0
3875- log_daemon_msg "Stopping nova volume" "nova-volume"
3876- start-stop-daemon --stop --oknodo --pidfile ${PIDFILE}
3877- log_end_msg $?
3878- ;;
3879+ log_daemon_msg "Stopping $DESC" "$NAME"
3880+ do_stop
3881+ case "$?" in
3882+ 0|1) log_end_msg 0 ;;
3883+ 2) log_end_msg 1 ;;
3884+ esac
3885+ ;;
3886+ status)
3887+ status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
3888+ ;;
3889 restart|force-reload)
3890- test "$ENABLED" = "true" || exit 1
3891- $0 start
3892- sleep 1
3893- $0 stop
3894- ;;
3895- status)
3896- test "$ENABLED" = "true" || exit 0
3897- status_of_proc -p $PIDFILE $DAEMON nova-volume && exit 0 || exit $?
3898- ;;
3899+ log_daemon_msg "Restarting $DESC" "$NAME"
3900+ do_stop
3901+ case "$?" in
3902+ 0|1)
3903+ do_start
3904+ case "$?" in
3905+ 0) log_end_msg 0 ;;
3906+ 1) log_end_msg 1 ;; # Old process is still running
3907+ *) log_end_msg 1 ;; # Failed to start
3908+ esac
3909+ ;;
3910+ *)
3911+ # Failed to stop
3912+ log_end_msg 1
3913+ ;;
3914+ esac
3915+ ;;
3916 *)
3917- log_action_msg "Usage: /etc/init.d/nova-volume {start|stop|restart|force-reload|status}"
3918- exit 1
3919- ;;
3920+ echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
3921+ exit 3
3922+ ;;
3923 esac
3924
3925-exit 0
3926+:
3927
3928=== added file 'debian/nova-volume.pyinstall'
3929--- debian/nova-volume.pyinstall 1970-01-01 00:00:00 +0000
3930+++ debian/nova-volume.pyinstall 2012-05-25 10:20:02 +0000
3931@@ -0,0 +1,1 @@
3932+nova/rootwrap/volume.py
3933
3934=== modified file 'debian/nova-volume.upstart.in'
3935--- debian/nova-volume.upstart.in 2011-08-11 13:29:06 +0000
3936+++ debian/nova-volume.upstart.in 2012-05-25 10:20:02 +0000
3937@@ -10,6 +10,9 @@
3938 pre-start script
3939 mkdir -p /var/run/nova
3940 chown nova:root /var/run/nova/
3941+
3942+ mkdir -p /var/lock/nova
3943+ chown nova:root /var/lock/nova/
3944 end script
3945
3946-exec su -c "nova-volume --flagfile=/etc/nova/nova.conf" nova
3947+exec su -s /bin/sh -c "exec nova-volume --flagfile=/etc/nova/nova.conf" nova
3948
3949=== added file 'debian/nova-xcp-network.init'
3950--- debian/nova-xcp-network.init 1970-01-01 00:00:00 +0000
3951+++ debian/nova-xcp-network.init 2012-05-25 10:20:02 +0000
3952@@ -0,0 +1,167 @@
3953+#!/bin/sh
3954+
3955+### BEGIN INIT INFO
3956+# Provides: nova-xcp-network
3957+# Required-Start: $remote_fs $syslog
3958+# Required-Stop: $remote_fs $syslog
3959+# Default-Start: 2 3 4 5
3960+# Default-Stop: 0 1 6
3961+# Short-Description: Apply initial OVS flows for Nova and network rules.
3962+# Description: Apply initial OVS flows for Nova, and setup networking
3963+# host rules for multi tenancy protections.
3964+### END INIT INFO
3965+
3966+# Written by Thomas Goirand <zigo@debian.org> using
3967+# plugins/xenserver/networking/etc/init.d/{openvswitch-nova,host-up}
3968+# as examples.
3969+#
3970+# Licensed under the Apache License, Version 2.0 (the "License"); you may
3971+# not use this file except in compliance with the License. You may obtain
3972+# a copy of the License at
3973+#
3974+# http://www.apache.org/licenses/LICENSE-2.0
3975+#
3976+# Unless required by applicable law or agreed to in writing, software
3977+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
3978+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
3979+# License for the specific language governing permissions and limitations
3980+# under the License.
3981+
3982+. /lib/init/vars.sh
3983+. /lib/lsb/init-functions
3984+
3985+DESC="XCP openvswitch networking rules"
3986+NAME="xcp-network"
3987+
3988+OVS_CONFIGURE_BASE_FLOWS=/usr/lib/xcp/plugins/ovs_configure_base_flows.py
3989+IPTABLES=/sbin/iptables
3990+EBTABLES=/sbin/ebtables
3991+ARPTABLES=/sbin/arptables
3992+
3993+# Quick check if everything is there...
3994+if ! [ -x ${OVS_CONFIGURE_BASE_FLOWS} ] ; then
3995+ exit 0
3996+fi
3997+if ! [ -x ${IPTABLES} -a -x ${EBTABLES} -a -x ${ARPTABLES} ] ; then
3998+ exit 0
3999+fi
4000+if ! [ -x /usr/bin/ovs-ofctl -a -x /usr/bin/ovs-vsctl -a -x /sbin/ip ] ; then
4001+ exit 0
4002+fi
4003+
4004+# Load the VERBOSE setting and other rcS variables
4005+[ -r /lib/init/vars.sh ] && . /lib/init/vars.sh
4006+
4007+# Get $INTERFACES from /etc/default/openvswitch-nova,
4008+# default to all what is available.
4009+if [ -r /etc/default/openvswitch-nova ] ; then
4010+ . /etc/default/openvswitch-nova
4011+fi
4012+if [ -z "${INTERFACES}" ] ; then
4013+ INTERFACES=$(cd /sys/class/net/; /bin/ls -d eth*)
4014+fi
4015+
4016+# Get $NETWORK_MODE from /etc/xcp/network.conf,
4017+# default to openvswitch
4018+if [ -e /etc/xcp/network.conf ] ; then
4019+ NETWORK_MODE=`cat /etc/xcp/network.conf`
4020+fi
4021+
4022+if [ -z "${NETWORK_MODE}" ] ; then
4023+ NETWORK_MODE=openvswitch
4024+fi
4025+
4026+# Check validity of $NETWORK_MODE
4027+case "${NETWORK_MODE}" in
4028+vswitch|openvswitch)
4029+ ;;
4030+bridge)
4031+ exit 0
4032+ ;;
4033+*)
4034+ echo "Open vSwitch disabled (/etc/xcp/network.conf is invalid)" >&2
4035+ exit 0
4036+ ;;
4037+esac
4038+
4039+run_ovs_conf_base_flows () {
4040+ my_action="${1}"
4041+ my_all_interfaces=$(cd /sys/class/net/; /bin/ls -d eth*)
4042+ for i in ${INTERFACES} ; do
4043+ /usr/bin/python $OVS_CONFIGURE_BASE_FLOWS $my_action $i
4044+ done
4045+}
4046+
4047+# Functions to configure the firewall to work with openvswitch, XCP and nova
4048+iptables_up () {
4049+ ${IPTABLES} -P FORWARD DROP
4050+ for i in ${INTERFACES} ; do
4051+ ${IPTABLES} -A FORWARD -m physdev --physdev-in ${i} -j ACCEPT
4052+ done
4053+}
4054+ebtables_up () {
4055+ ${EBTABLES} -P FORWARD DROP
4056+ for i in ${INTERFACES} ; do
4057+ ${EBTABLES} -A FORWARD -o ${i} -j ACCEPT
4058+ done
4059+}
4060+arptables_up () {
4061+ ${ARPTABLES} -P FORWARD DROP
4062+ for i in ${INTERFACES} ; do
4063+ ${ARPTABLES} -A FORWARD --opcode Request --in-interface ${i} -j ACCEPT
4064+ ${ARPTABLES} -A FORWARD --opcode Reply --in-interface ${i} -j ACCEPT
4065+ done
4066+}
4067+iptables_down () {
4068+ ${IPTABLES} -P FORWARD ACCEPT
4069+ for i in ${INTERFACES} ; do
4070+ ${IPTABLES} -D FORWARD -m physdev --physdev-in ${i} -j ACCEPT
4071+ done
4072+}
4073+ebtables_down () {
4074+ ${EBTABLES} -P FORWARD ACCEPT
4075+ for i in ${INTERFACES} ; do
4076+ ${EBTABLES} -D FORWARD -o ${i} -j ACCEPT
4077+ done
4078+}
4079+arptables_down () {
4080+ ${ARPTABLES} -P FORWARD ACCEPT
4081+ for i in ${INTERFACES} ; do
4082+ ${ARPTABLES} -D FORWARD --opcode Request --in-interface ${i} -j ACCEPT
4083+ ${ARPTABLES} -D FORWARD --opcode Reply --in-interface ${i} -j ACCEPT
4084+ done
4085+}
4086+
4087+case "${1}" in
4088+start)
4089+ [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
4090+ iptables_up
4091+ ebtables_up
4092+ arptables_up
4093+ run_ovs_conf_base_flows online
4094+ [ "$VERBOSE" != no ] && log_end_msg 0
4095+ ;;
4096+stop)
4097+ [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
4098+ run_ovs_conf_base_flows offline
4099+ iptables_down
4100+ ebtables_down
4101+ arptables_down
4102+ [ "$VERBOSE" != no ] && log_end_msg 0
4103+ ;;
4104+reload|force-reload)
4105+ [ "$VERBOSE" != no ] && log_daemon_msg "Restarting $DESC" "$NAME"
4106+ run_ovs_conf_base_flows reset
4107+ [ "$VERBOSE" != no ] && log_end_msg 0
4108+ ;;
4109+restart)
4110+ $0 start
4111+ sleep 1
4112+ $0 stop
4113+ ;;
4114+*)
4115+ echo "Usage: $0 {start|stop|status|restart|reload|force-reload}" >&2
4116+ ;;
4117+esac
4118+
4119+exit 0
4120
4121=== added file 'debian/nova-xcp-network.install'
4122--- debian/nova-xcp-network.install 1970-01-01 00:00:00 +0000
4123+++ debian/nova-xcp-network.install 2012-05-25 10:20:02 +0000
4124@@ -0,0 +1,6 @@
4125+plugins/xenserver/networking/etc/sysconfig/openvswitch-nova /etc/default
4126+debian/xen-openvswitch-nova.rules /lib/udev/rules.d
4127+plugins/xenserver/networking/etc/xensource/scripts/novalib.py /usr/lib/xcp/plugins
4128+plugins/xenserver/networking/etc/xensource/scripts/ovs_configure_base_flows.py /usr/lib/xcp/plugins
4129+plugins/xenserver/networking/etc/xensource/scripts/ovs_configure_vif_flows.py /usr/lib/xcp/plugins
4130+plugins/xenserver/networking/etc/xensource/scripts/vif_rules.py /usr/lib/xcp/plugins
4131
4132=== added file 'debian/nova-xcp-plugins.docs'
4133--- debian/nova-xcp-plugins.docs 1970-01-01 00:00:00 +0000
4134+++ debian/nova-xcp-plugins.docs 2012-05-25 10:20:02 +0000
4135@@ -0,0 +1,1 @@
4136+debian/README.xcp_and_openstack
4137
4138=== added file 'debian/nova-xcp-plugins.install'
4139--- debian/nova-xcp-plugins.install 1970-01-01 00:00:00 +0000
4140+++ debian/nova-xcp-plugins.install 2012-05-25 10:20:02 +0000
4141@@ -0,0 +1,6 @@
4142+plugins/xenserver/xenapi/etc/xapi.d/plugins/agent /usr/lib/xcp/plugins
4143+plugins/xenserver/xenapi/etc/xapi.d/plugins/glance /usr/lib/xcp/plugins
4144+plugins/xenserver/xenapi/etc/xapi.d/plugins/migration /usr/lib/xcp/plugins
4145+plugins/xenserver/xenapi/etc/xapi.d/plugins/pluginlib_nova.py /usr/lib/xcp/plugins
4146+plugins/xenserver/xenapi/etc/xapi.d/plugins/xenhost /usr/lib/xcp/plugins
4147+plugins/xenserver/xenapi/etc/xapi.d/plugins/xenstore.py /usr/lib/xcp/plugins
4148
4149=== added file 'debian/nova-xcp-plugins.postinst'
4150--- debian/nova-xcp-plugins.postinst 1970-01-01 00:00:00 +0000
4151+++ debian/nova-xcp-plugins.postinst 2012-05-25 10:20:02 +0000
4152@@ -0,0 +1,13 @@
4153+#!/bin/sh
4154+
4155+set -e
4156+
4157+if [ "$1" = "configure" ] ; then
4158+ if ! [ -e /etc/xcp/xenhost.conf ] ; then
4159+ echo "{}" >/etc/xcp/xenhost.conf
4160+ fi
4161+fi
4162+
4163+#DEBHELPER#
4164+
4165+exit 0
4166
4167=== added file 'debian/nova-xcp-plugins.postrm'
4168--- debian/nova-xcp-plugins.postrm 1970-01-01 00:00:00 +0000
4169+++ debian/nova-xcp-plugins.postrm 2012-05-25 10:20:02 +0000
4170@@ -0,0 +1,11 @@
4171+#!/bin/sh
4172+
4173+set -e
4174+
4175+if [ "$1" = "purge" ] ; then
4176+ rm -f /etc/xcp/xenhost.conf
4177+fi
4178+
4179+#DEBHELPER#
4180+
4181+exit 0
4182
4183=== added file 'debian/nova-xvpvncproxy.init'
4184--- debian/nova-xvpvncproxy.init 1970-01-01 00:00:00 +0000
4185+++ debian/nova-xvpvncproxy.init 2012-05-25 10:20:02 +0000
4186@@ -0,0 +1,97 @@
4187+#!/bin/sh
4188+### BEGIN INIT INFO
4189+# Provides: nova-xvpvncproxy
4190+# Required-Start: $network $local_fs $remote_fs $syslog
4191+# Required-Stop: $remote_fs
4192+# Default-Start: 2 3 4 5
4193+# Default-Stop: 0 1 6
4194+# Short-Description: Nova XVP VNC proxy
4195+# Description: Nova XVP VNC proxy
4196+### END INIT INFO
4197+
4198+# Author: Julien Danjou <acid@debian.org>
4199+
4200+# PATH should only include /usr/* if it runs after the mountnfs.sh script
4201+PATH=/sbin:/usr/sbin:/bin:/usr/bin
4202+DESC="OpenStack XVP VNC proxy"
4203+NAME=nova-xvpvncproxy
4204+DAEMON=/usr/bin/nova-xvpvncproxy
4205+DAEMON_ARGS="--flagfile=/etc/nova/nova.conf"
4206+PIDFILE=/var/run/$NAME.pid
4207+SCRIPTNAME=/etc/init.d/$NAME
4208+NOVA_USER=nova
4209+LOCK_DIR=/var/lock/nova/
4210+
4211+# Exit if the package is not installed
4212+[ -x $DAEMON ] || exit 0
4213+
4214+mkdir -p ${LOCK_DIR}
4215+chown ${NOVA_USER} ${LOCK_DIR}
4216+
4217+# Read configuration variable file if it is present
4218+[ -r /etc/default/$NAME ] && . /etc/default/$NAME
4219+
4220+. /lib/lsb/init-functions
4221+
4222+do_start()
4223+{
4224+ start-stop-daemon --start --background --quiet --chuid ${NOVA_USER}:nova --make-pidfile --pidfile $PIDFILE --startas $DAEMON --test > /dev/null \
4225+ || return 1
4226+ start-stop-daemon --start --background --quiet --chuid ${NOVA_USER}:nova --make-pidfile --pidfile $PIDFILE --startas $DAEMON -- \
4227+ $DAEMON_ARGS \
4228+ || return 2
4229+}
4230+
4231+do_stop()
4232+{
4233+ start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE
4234+ RETVAL="$?"
4235+ rm -f $PIDFILE
4236+ return "$RETVAL"
4237+}
4238+
4239+case "$1" in
4240+ start)
4241+ log_daemon_msg "Starting $DESC " "$NAME"
4242+ do_start
4243+ case "$?" in
4244+ 0|1) log_end_msg 0 ;;
4245+ 2) log_end_msg 1 ;;
4246+ esac
4247+ ;;
4248+ stop)
4249+ log_daemon_msg "Stopping $DESC" "$NAME"
4250+ do_stop
4251+ case "$?" in
4252+ 0|1) log_end_msg 0 ;;
4253+ 2) log_end_msg 1 ;;
4254+ esac
4255+ ;;
4256+ status)
4257+ status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
4258+ ;;
4259+ restart|force-reload)
4260+ log_daemon_msg "Restarting $DESC" "$NAME"
4261+ do_stop
4262+ case "$?" in
4263+ 0|1)
4264+ do_start
4265+ case "$?" in
4266+ 0) log_end_msg 0 ;;
4267+ 1) log_end_msg 1 ;; # Old process is still running
4268+ *) log_end_msg 1 ;; # Failed to start
4269+ esac
4270+ ;;
4271+ *)
4272+ # Failed to stop
4273+ log_end_msg 1
4274+ ;;
4275+ esac
4276+ ;;
4277+ *)
4278+ echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
4279+ exit 3
4280+ ;;
4281+esac
4282+
4283+:
4284
4285=== added file 'debian/nova-xvpvncproxy.install'
4286--- debian/nova-xvpvncproxy.install 1970-01-01 00:00:00 +0000
4287+++ debian/nova-xvpvncproxy.install 2012-05-25 10:20:02 +0000
4288@@ -0,0 +1,1 @@
4289+usr/bin/nova-xvpvncproxy
4290
4291=== added file 'debian/nova-xvpvncproxy.logrotate'
4292--- debian/nova-xvpvncproxy.logrotate 1970-01-01 00:00:00 +0000
4293+++ debian/nova-xvpvncproxy.logrotate 2012-05-25 10:20:02 +0000
4294@@ -0,0 +1,4 @@
4295+/var/log/nova/nova-vncproxy.log {
4296+ daily
4297+ missingok
4298+}
4299\ No newline at end of file
4300
4301=== modified file 'debian/nova.conf'
4302--- debian/nova.conf 2011-09-27 01:29:58 +0000
4303+++ debian/nova.conf 2012-05-25 10:20:02 +0000
4304@@ -3,7 +3,10 @@
4305 --logdir=/var/log/nova
4306 --state_path=/var/lib/nova
4307 --lock_path=/var/lock/nova
4308---force_dhcp_release=True
4309---use_deprecated_auth
4310+--force_dhcp_release
4311 --iscsi_helper=tgtadm
4312+--libvirt_use_virtio_for_bridges
4313+--connection_type=libvirt
4314+--root_helper=sudo nova-rootwrap
4315 --verbose
4316+--ec2_private_dns_show_ip
4317
4318=== modified file 'debian/nova_sudoers'
4319--- debian/nova_sudoers 2011-09-28 17:01:05 +0000
4320+++ debian/nova_sudoers 2012-05-25 10:20:02 +0000
4321@@ -1,48 +1,3 @@
4322-Cmnd_Alias NOVACMDS = /bin/chmod /var/lib/nova/tmp/*/root/.ssh, \
4323- /bin/chown /var/lib/nova/tmp/*/root/.ssh, \
4324- /bin/chown, \
4325- /bin/chmod, \
4326- /bin/dd, \
4327- /sbin/ifconfig, \
4328- /sbin/ip, \
4329- /sbin/route, \
4330- /sbin/iptables, \
4331- /sbin/iptables-save, \
4332- /sbin/iptables-restore, \
4333- /sbin/ip6tables-save, \
4334- /sbin/ip6tables-restore, \
4335- /sbin/kpartx, \
4336- /sbin/losetup, \
4337- /sbin/lvcreate, \
4338- /sbin/lvdisplay, \
4339- /sbin/lvremove, \
4340- /bin/mkdir, \
4341- /bin/mount, \
4342- /sbin/pvcreate, \
4343- /usr/bin/tee, \
4344- /sbin/tune2fs, \
4345- /bin/umount, \
4346- /sbin/vgcreate, \
4347- /usr/bin/virsh, \
4348- /usr/bin/qemu-nbd, \
4349- /usr/sbin/brctl, \
4350- /sbin/brctl, \
4351- /usr/sbin/radvd, \
4352- /sbin/pvcreate, \
4353- /sbin/aoe-discover, \
4354- /sbin/vgcreate, \
4355- /bin/aoe-stat, \
4356- /bin/kill, \
4357- /sbin/vconfig, \
4358- /usr/sbin/tgtadm, \
4359- /usr/sbin/ietadm, \
4360- /sbin/vgs, \
4361- /sbin/iscsiadm, \
4362- /sbin/parted, \
4363- /usr/sbin/dnsmasq, \
4364- /usr/bin/arping, \
4365- /bin/netcat, \
4366- /usr/bin/dhcp_release
4367-
4368-nova ALL = (root) NOPASSWD: SETENV: NOVACMDS
4369-
4370+Defaults:nova !requiretty
4371+
4372+nova ALL = (root) NOPASSWD: /usr/bin/nova-rootwrap
4373
4374=== added file 'debian/patches/0001-fix-useexisting-deprecation-warnings.patch'
4375--- debian/patches/0001-fix-useexisting-deprecation-warnings.patch 1970-01-01 00:00:00 +0000
4376+++ debian/patches/0001-fix-useexisting-deprecation-warnings.patch 2012-05-25 10:20:02 +0000
4377@@ -0,0 +1,52 @@
4378+From 0d68f87ed726644f9387c47c862b7ee8cbcc77ad Mon Sep 17 00:00:00 2001
4379+From: =?UTF-8?q?P=C3=A1draig=20Brady?= <pbrady@redhat.com>
4380+Date: Thu, 8 Mar 2012 16:32:30 +0000
4381+Subject: [PATCH] fix useexisting deprecation warnings
4382+
4383+Fixes deprecation warnings when using sqlalchemy >= 0.7.0
4384+Fixes bug 941951
4385+
4386+Change-Id: Iaa57153f99c60c67a14c1dca849188937bdc5dee
4387+---
4388+ .../075_convert_bw_usage_to_store_network_id.py | 4 ++--
4389+ .../versions/081_drop_instance_id_bw_cache.py | 2 +-
4390+ 2 files changed, 3 insertions(+), 3 deletions(-)
4391+
4392+diff --git a/nova/db/sqlalchemy/migrate_repo/versions/075_convert_bw_usage_to_store_network_id.py b/nova/db/sqlalchemy/migrate_repo/versions/075_convert_bw_usage_to_store_network_id.py
4393+index b275524..4ff3d99 100644
4394+--- a/nova/db/sqlalchemy/migrate_repo/versions/075_convert_bw_usage_to_store_network_id.py
4395++++ b/nova/db/sqlalchemy/migrate_repo/versions/075_convert_bw_usage_to_store_network_id.py
4396+@@ -46,7 +46,7 @@ def upgrade(migrate_engine):
4397+ Column('last_refreshed', DateTime(timezone=False)),
4398+ Column('bw_in', BigInteger()),
4399+ Column('bw_out', BigInteger()),
4400+- useexisting=True)
4401++ extend_existing=True)
4402+ mac_column = Column('mac', String(255))
4403+ bw_usage_cache.create_column(mac_column)
4404+
4405+@@ -81,7 +81,7 @@ def downgrade(migrate_engine):
4406+ Column('last_refreshed', DateTime(timezone=False)),
4407+ Column('bw_in', BigInteger()),
4408+ Column('bw_out', BigInteger()),
4409+- useexisting=True)
4410++ extend_existing=True)
4411+
4412+ network_label_column = Column('network_label', String(255))
4413+ bw_usage_cache.create_column(network_label_column)
4414+diff --git a/nova/db/sqlalchemy/migrate_repo/versions/081_drop_instance_id_bw_cache.py b/nova/db/sqlalchemy/migrate_repo/versions/081_drop_instance_id_bw_cache.py
4415+index c6687ac..a607ed3 100644
4416+--- a/nova/db/sqlalchemy/migrate_repo/versions/081_drop_instance_id_bw_cache.py
4417++++ b/nova/db/sqlalchemy/migrate_repo/versions/081_drop_instance_id_bw_cache.py
4418+@@ -37,7 +37,7 @@ def upgrade(migrate_engine):
4419+ Column('last_refreshed', DateTime(timezone=False)),
4420+ Column('bw_in', BigInteger()),
4421+ Column('bw_out', BigInteger()),
4422+- useexisting=True)
4423++ extend_existing=True)
4424+
4425+ bw_usage_cache.drop_column('instance_id')
4426+
4427+--
4428+1.7.9.1
4429+
4430
4431=== renamed file 'debian/patches/backport-libvirt-console-pipe.patch' => 'debian/patches/backport-libvirt-console-pipe.patch.THIS'
4432=== removed file 'debian/patches/backport-lxc-container-console-fix.patch'
4433--- debian/patches/backport-lxc-container-console-fix.patch 2011-09-30 15:03:48 +0000
4434+++ debian/patches/backport-lxc-container-console-fix.patch 1970-01-01 00:00:00 +0000
4435@@ -1,43 +0,0 @@
4436-Description: Make LXC container console usuable.
4437-Author: Chuck Short <zulcss@ubuntu.com>
4438-Status: https://review.openstack.org/#change,728
4439-diff -Naurp nova-2011.3.orig//nova/virt/libvirt/connection.py nova-2011.3//nova/virt/libvirt/connection.py
4440---- nova-2011.3.orig//nova/virt/libvirt/connection.py 2011-09-30 11:01:01.000000000 -0400
4441-+++ nova-2011.3//nova/virt/libvirt/connection.py 2011-09-30 11:01:21.939404556 -0400
4442-@@ -696,6 +696,26 @@ class LibvirtConnection(driver.ComputeDr
4443- timer = utils.LoopingCall(_wait_for_boot)
4444- return timer.start(interval=0.5, now=True)
4445-
4446-+ def _get_lxc_console(self, instance):
4447-+ """Get the LXC console for a running libvirt domain."""
4448-+ virt_dom = self._lookup_by_name(instance)
4449-+ xml = virt_dom.XMLDesc(0)
4450-+ dom = minidom.parseString(xml)
4451-+
4452-+ for console in dom.getElementsByTagName('console'):
4453-+ if console.getAttribute('type') == 'pty':
4454-+ source = console.getElementsByTagName('source')[0]
4455-+ pty_device = source.getAttribute('path')
4456-+
4457-+
4458-+ out,err = utils.execute('dd',
4459-+ 'if=%s' % pty_device,
4460-+ 'iflag=nonblock',
4461-+ run_as_root=True,
4462-+ check_exit_code=False)
4463-+
4464-+ return out
4465-+
4466- def _flush_xen_console(self, virsh_output):
4467- LOG.info(_('virsh said: %r'), virsh_output)
4468- virsh_output = virsh_output[0].strip()
4469-@@ -738,7 +758,8 @@ class LibvirtConnection(driver.ComputeDr
4470- self._append_to_file(data, console_fifo)
4471- elif FLAGS.libvirt_type == 'lxc':
4472- # LXC is also special
4473-- LOG.info(_("Unable to read LXC console"))
4474-+ data = self._get_lxc_console(instance['name'])
4475-+ self._append_to_file(data, console_fifo)
4476-
4477- return self.console_loggers[instance['name']].peek()
4478-
4479
4480=== added file 'debian/patches/fix-docs-build-without-network.patch'
4481--- debian/patches/fix-docs-build-without-network.patch 1970-01-01 00:00:00 +0000
4482+++ debian/patches/fix-docs-build-without-network.patch 2012-05-25 10:20:02 +0000
4483@@ -0,0 +1,15 @@
4484+Description: Build docs without network access.
4485+Author: Chuck Short <zulcss@ubuntu.com>
4486+Forwarded: no
4487+diff -Naurp nova-2012.1.orig/doc/source/conf.py nova-2012.1/doc/source/conf.py
4488+--- nova-2012.1.orig/doc/source/conf.py 2012-03-20 07:05:42.000000000 -0400
4489++++ nova-2012.1/doc/source/conf.py 2012-04-01 09:06:18.847194995 -0400
4490+@@ -25,7 +25,7 @@ sys.path.insert(0, os.path.abspath('./')
4491+ # Add any Sphinx extension module names here, as strings. They can be extensions
4492+ # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
4493+
4494+-extensions = ['sphinx.ext.autodoc', 'sphinx.ext.intersphinx', 'ext.nova_todo', 'sphinx.ext.coverage', 'sphinx.ext.pngmath', 'sphinx.ext.ifconfig','sphinx.ext.graphviz']
4495++extensions = ['sphinx.ext.autodoc', 'ext.nova_todo', 'sphinx.ext.coverage', 'sphinx.ext.pngmath', 'sphinx.ext.ifconfig','sphinx.ext.graphviz']
4496+
4497+ # autodoc generation is a bit aggressive and a nuisance when doing heavy text edit cycles.
4498+ # execute "export SPHINX_DEBUG=1" in your terminal to disable
4499
4500=== added file 'debian/patches/fix-ubuntu-tests.patch'
4501--- debian/patches/fix-ubuntu-tests.patch 1970-01-01 00:00:00 +0000
4502+++ debian/patches/fix-ubuntu-tests.patch 2012-05-25 10:20:02 +0000
4503@@ -0,0 +1,15 @@
4504+Description: Fix tests in ubuntu.
4505+Author: Chuck Short <zulcss@ubuntu.com>
4506+Forwarded: no
4507+diff -Naurp nova-2012.1.orig/nova/tests/test_api.py nova-2012.1/nova/tests/test_api.py
4508+--- nova-2012.1.orig/nova/tests/test_api.py 2012-03-20 07:05:43.000000000 -0400
4509++++ nova-2012.1/nova/tests/test_api.py 2012-03-28 10:23:20.074907910 -0400
4510+@@ -405,7 +405,7 @@ class ApiEc2TestCase(test.TestCase):
4511+ raise self.failureException, 'EC2ResponseError not raised'
4512+
4513+ # Invalid CIDR address
4514+- _assert('Invalid CIDR', 'tcp', 80, 81, '0.0.0.0/0444')
4515++ #_assert('Invalid CIDR', 'tcp', 80, 81, '0.0.0.0/0444')
4516+ # Missing ports
4517+ _assert('Not enough parameters', 'tcp', '0.0.0.0/0')
4518+ # from port cannot be greater than to port
4519
4520=== added file 'debian/patches/kombu_tests_timeout.patch'
4521--- debian/patches/kombu_tests_timeout.patch 1970-01-01 00:00:00 +0000
4522+++ debian/patches/kombu_tests_timeout.patch 2012-05-25 10:20:02 +0000
4523@@ -0,0 +1,11 @@
4524+diff -Naurp nova-2012.1.orig/nova/tests/rpc/test_kombu.py nova-2012.1/nova/tests/rpc/test_kombu.py
4525+--- nova-2012.1.orig/nova/tests/rpc/test_kombu.py 2012-01-20 02:30:56.000000000 -0500
4526++++ nova-2012.1/nova/tests/rpc/test_kombu.py 2012-01-20 12:40:25.373592963 -0500
4527+@@ -201,6 +201,7 @@ class RpcKombuTestCase(common._BaseRpcTe
4528+
4529+ self.assertEqual(info['called'], 2)
4530+
4531++ @test.skip_test("This tests does not timeout on Ubuntu")
4532+ def test_iterconsume_errors_will_reconnect(self):
4533+ conn = self.rpc.Connection()
4534+ message = 'reconnect test message'
4535
4536=== added file 'debian/patches/nova-console-monitor.patch'
4537--- debian/patches/nova-console-monitor.patch 1970-01-01 00:00:00 +0000
4538+++ debian/patches/nova-console-monitor.patch 2012-05-25 10:20:02 +0000
4539@@ -0,0 +1,138 @@
4540+From 742e5512dbee26080f14490292d50278d59f10ac Mon Sep 17 00:00:00 2001
4541+From: Chuck Short <chuck.short@canonical.com>
4542+Date: Thu, 29 Mar 2012 13:10:22 -0400
4543+Subject: [PATCH] Monitor console.log for indefinite growth
4544+
4545+Using the libvirt serial console, everything
4546+that is dumped into a console.log file, this file can
4547+keep on growing depending on what the user is doing in the console.
4548+
4549+This patch adds add a new flag called "use_console_monitor",
4550+the console monitor will check the instance's console.log size.
4551+If it goes past a certain amount it will warn in the nova-compute.log
4552+file that it is growing and when was the file last modified.
4553+
4554+This bug does not entirely fix bug 832507, but it is a stop
4555+gap measure until we can resolve it properly in libvirt
4556+or qemu-kvm.
4557+
4558+Change-Id: I00ebc716dccbe9fb97e2b8a3cb5d5e496bc7719b
4559+Signed-off-by: Chuck Short <chuck.short@canonical.com>
4560+---
4561+ nova/compute/manager.py | 24 +++++++++++++++++++++++-
4562+ nova/tests/test_compute.py | 9 +++++++++
4563+ nova/virt/driver.py | 11 +++++++++++
4564+ nova/virt/libvirt/connection.py | 13 +++++++++++++
4565+ 4 files changed, 56 insertions(+), 1 deletions(-)
4566+
4567+diff --git a/nova/compute/manager.py b/nova/compute/manager.py
4568+index 48e135b..c5a4bb3 100644
4569+--- a/nova/compute/manager.py
4570++++ b/nova/compute/manager.py
4571+@@ -118,7 +118,13 @@ compute_opts = [
4572+ cfg.IntOpt("heal_instance_info_cache_interval",
4573+ default=60,
4574+ help="Number of seconds between instance info_cache self "
4575+- "healing updates")
4576++ "healing updates"),
4577++ cfg.BoolOpt("use_console_monitor",
4578++ default=False,
4579++ help="Use scheduler to monitor the console.log."),
4580++ cfg.IntOpt("console_threshold_size",
4581++ default=104857600,
4582++ help="Max console.log size.")
4583+ ]
4584+
4585+ FLAGS = flags.FLAGS
4586+@@ -2393,6 +2399,22 @@ class ComputeManager(manager.SchedulerDependentManager):
4587+ self._delete_instance(context, instance)
4588+
4589+ @manager.periodic_task
4590++ def run_console_monitor(self, context):
4591++ """Monitor the console.log size for a given instance."""
4592++ if not FLAGS.use_console_monitor:
4593++ return
4594++
4595++ try:
4596++ LOG.info(_('Running console monitor'))
4597++ instances = self.db.instance_get_all_by_host(context, self.host)
4598++ for instance in instances:
4599++ drv_state = self._get_power_state(context, instance)
4600++ if drv_state == power_state.RUNNING:
4601++ self.driver.monitor_console_log(instance)
4602++ except NotImplementedError:
4603++ pass
4604++
4605++ @manager.periodic_task
4606+ def update_available_resource(self, context):
4607+ """See driver.update_available_resource()
4608+
4609+diff --git a/nova/tests/test_compute.py b/nova/tests/test_compute.py
4610+index 305282c..53dd08f 100644
4611+--- a/nova/tests/test_compute.py
4612++++ b/nova/tests/test_compute.py
4613+@@ -744,6 +744,15 @@ class ComputeTestCase(BaseTestCase):
4614+ self.assertEqual(output, 'ANOTHER\nLAST LINE')
4615+ self.compute.terminate_instance(self.context, instance['uuid'])
4616+
4617++ def test_console_monitor(self):
4618++ """Make sure we can montior console from instance"""
4619++ self.flags(use_console_monitor=True)
4620++ context = self.context.elevated()
4621++ instance = self._create_fake_instance()
4622++ self.compute.run_instance(context, instance['uuid'])
4623++ self.compute.run_console_monitor(context)
4624++ self.compute.terminate_instance(self.context, instance['uuid'])
4625++
4626+ def test_novnc_vnc_console(self):
4627+ """Make sure we can a vnc console for an instance."""
4628+ instance = self._create_fake_instance()
4629+diff --git a/nova/virt/driver.py b/nova/virt/driver.py
4630+index 9658273..e0a0ca1 100644
4631+--- a/nova/virt/driver.py
4632++++ b/nova/virt/driver.py
4633+@@ -663,6 +663,17 @@ class ComputeDriver(object):
4634+ related to other calls into the driver. The prime example is to clean
4635+ the cache and remove images which are no longer of interest.
4636+ """
4637++ pass
4638++
4639++ def monitor_console_log(self, instance):
4640++ """
4641++ Manage the drivers console.log
4642++
4643++ Some drives just dump the serial console to a file. This method
4644++ monitors the console.log, so the console.log file can remain
4645++ managable.
4646++ """
4647++ pass
4648+
4649+ def add_to_aggregate(self, context, aggregate, host, **kwargs):
4650+ """Add a compute host to an aggregate."""
4651+diff --git a/nova/virt/libvirt/connection.py b/nova/virt/libvirt/connection.py
4652+index 3c4bbb0..10e4cf1 100644
4653+--- a/nova/virt/libvirt/connection.py
4654++++ b/nova/virt/libvirt/connection.py
4655+@@ -2434,6 +2434,19 @@ class LibvirtConnection(driver.ComputeDriver):
4656+ """Manage the local cache of images."""
4657+ self.image_cache_manager.verify_base_images(context)
4658+
4659++ def monitor_console_log(self, instance):
4660++ console_log_file = os.path.join(FLAGS.instances_path,
4661++ instance['name'],
4662++ 'console.log')
4663++ if os.path.exists(console_log_file):
4664++ stat = os.stat(console_log_file)
4665++ if stat.st_size >= FLAGS.console_threshold_size:
4666++ size = stat.st_size
4667++ file_acess_time = stat.st_mtime
4668++ LOG.warn(_('console.log size: %(size)s bytes, '
4669++ 'last accessed: %(file_acess_time)s.')
4670++ % locals(), instance=instance)
4671++
4672+ @exception.wrap_exception()
4673+ def migrate_disk_and_power_off(self, context, instance, dest,
4674+ instance_type, network_info):
4675+--
4676+1.7.9.1
4677+
4678
4679=== modified file 'debian/patches/nova-manage_flagfile_location.patch'
4680--- debian/patches/nova-manage_flagfile_location.patch 2011-05-06 15:33:23 +0000
4681+++ debian/patches/nova-manage_flagfile_location.patch 2012-05-25 10:20:02 +0000
4682@@ -1,14 +1,13 @@
4683-=== modified file 'bin/nova-manage'
4684-Index: nova-2011.3~bzr1054/bin/nova-manage
4685+Index: nova-2012.1~e4~20120207.12506/bin/nova-manage
4686 ===================================================================
4687---- nova-2011.3~bzr1054.orig/bin/nova-manage
4688-+++ nova-2011.3~bzr1054/bin/nova-manage
4689-@@ -1098,7 +1098,7 @@
4690+--- nova-2012.1~e4~20120207.12506.orig/bin/nova-manage
4691++++ nova-2012.1~e4~20120207.12506/bin/nova-manage
4692+@@ -2307,7 +2307,7 @@
4693
4694 def main():
4695 """Parse options and call the appropriate class/method."""
4696-- utils.default_flagfile()
4697-+ utils.default_flagfile('/etc/nova/nova.conf')
4698- argv = FLAGS(sys.argv)
4699- logging.setup()
4700+- flagfile = utils.default_flagfile()
4701++ flagfile = utils.default_flagfile('/etc/nova/nova.conf')
4702
4703+ if flagfile and not os.access(flagfile, os.R_OK):
4704+ st = os.stat(flagfile)
4705
4706=== removed file 'debian/patches/packaged-ajaxterm-calls.patch'
4707--- debian/patches/packaged-ajaxterm-calls.patch 2011-08-10 13:36:43 +0000
4708+++ debian/patches/packaged-ajaxterm-calls.patch 1970-01-01 00:00:00 +0000
4709@@ -1,19 +0,0 @@
4710-Description: Fixes command line for ajaxterm
4711-Forwarded: not-needed
4712-Author: Soren Hansen <soren@ubuntu.com>
4713-Last-Update: 2011-04-15
4714-Index: nova-2011.3~bzr1113/nova/virt/libvirt/connection.py
4715-===================================================================
4716---- nova-2011.3~bzr1113.orig/nova/virt/libvirt/connection.py
4717-+++ nova-2011.3~bzr1113/nova/virt/libvirt/connection.py
4718-@@ -681,8 +681,8 @@
4719- ajaxterm_cmd = 'sudo socat - %s' \
4720- % get_pty_for_instance(instance['name'])
4721-
4722-- cmd = ['%s/tools/ajaxterm/ajaxterm.py' % utils.novadir(),
4723-- '--command', ajaxterm_cmd, '-t', token, '-p', port]
4724-+ cmd = ['ajaxterm', '--command', ajaxterm_cmd, '-t', token,
4725-+ '-p', port, '-T', '300']
4726-
4727- utils.execute(cmd)
4728- return {'token': token, 'host': host, 'port': port}
4729
4730=== added file 'debian/patches/path-to-the-xenhost.conf-fixup.patch'
4731--- debian/patches/path-to-the-xenhost.conf-fixup.patch 1970-01-01 00:00:00 +0000
4732+++ debian/patches/path-to-the-xenhost.conf-fixup.patch 2012-05-25 10:20:02 +0000
4733@@ -0,0 +1,12 @@
4734+diff -Naurp nova-2012.1.orig/plugins/xenserver/xenapi/etc/xapi.d/plugins/xenhost nova-2012.1/plugins/xenserver/xenapi/etc/xapi.d/plugins/xenhost
4735+--- nova-2012.1.orig/plugins/xenserver/xenapi/etc/xapi.d/plugins/xenhost 2012-03-01 12:45:52.000000000 -0500
4736++++ nova-2012.1/plugins/xenserver/xenapi/etc/xapi.d/plugins/xenhost 2012-03-02 11:02:03.078762386 -0500
4737+@@ -41,7 +41,7 @@ import pluginlib_nova as pluginlib
4738+ pluginlib.configure_logging("xenhost")
4739+
4740+ host_data_pattern = re.compile(r"\s*(\S+) \([^\)]+\) *: ?(.*)")
4741+-config_file_path = "/usr/etc/xenhost.conf"
4742++config_file_path = "/etc/xcp/xenhost.conf"
4743+ DEFAULT_TRIES = 23
4744+ DEFAULT_SLEEP = 10
4745+
4746
4747=== modified file 'debian/patches/series'
4748--- debian/patches/series 2012-02-07 16:57:58 +0000
4749+++ debian/patches/series 2012-05-25 10:20:02 +0000
4750@@ -1,5 +1,15 @@
4751 nova-manage_flagfile_location.patch
4752+<<<<<<< TREE
4753 packaged-ajaxterm-calls.patch
4754 # Ubuntu changes below this line
4755 backport-libvirt-console-pipe.patch
4756 backport-lxc-container-console-fix.patch
4757+=======
4758+# Ubuntu specific patches below here. Note these can be dropped eventually.
4759+kombu_tests_timeout.patch
4760+#nova-console-monitor.patch
4761+path-to-the-xenhost.conf-fixup.patch
4762+fix-ubuntu-tests.patch
4763+fix-docs-build-without-network.patch
4764+0001-fix-useexisting-deprecation-warnings.patch
4765+>>>>>>> MERGE-SOURCE
4766
4767=== added directory 'debian/patches/upstream'
4768=== added file 'debian/patches/upstream/0001-fix-bug-where-nova-ignores-glance-host-in-imageref.patch'
4769--- debian/patches/upstream/0001-fix-bug-where-nova-ignores-glance-host-in-imageref.patch 1970-01-01 00:00:00 +0000
4770+++ debian/patches/upstream/0001-fix-bug-where-nova-ignores-glance-host-in-imageref.patch 2012-05-25 10:20:02 +0000
4771@@ -0,0 +1,51 @@
4772+From 155c7b2a8f05e75a9b08764bb4f9404c26036f99 Mon Sep 17 00:00:00 2001
4773+From: Mike Lundy <mike@pistoncloud.com>
4774+Date: Wed, 4 Apr 2012 11:38:54 -0700
4775+Subject: [PATCH 1/5] fix bug where nova ignores glance host in imageref
4776+
4777+This is related to bug 883328.
4778+
4779+Change-Id: Iadd1aec8d1bda3bd75bd0ab7f6797b643626db90
4780+---
4781+ nova/image/glance.py | 8 ++++----
4782+ nova/tests/image/test_glance.py | 3 ++-
4783+ 2 files changed, 6 insertions(+), 5 deletions(-)
4784+
4785+diff --git a/nova/image/glance.py b/nova/image/glance.py
4786+index a5f9e68..97a60cb 100644
4787+--- a/nova/image/glance.py
4788++++ b/nova/image/glance.py
4789+@@ -111,13 +111,13 @@ def get_glance_client(context, image_href):
4790+
4791+ else:
4792+ try:
4793+- (image_id, host, port) = _parse_image_ref(image_href)
4794++ (image_id, glance_host, glance_port) = _parse_image_ref(image_href)
4795++ glance_client = _create_glance_client(context,
4796++ glance_host,
4797++ glance_port)
4798+ except ValueError:
4799+ raise exception.InvalidImageRef(image_href=image_href)
4800+
4801+- glance_client = _create_glance_client(context,
4802+- glance_host,
4803+- glance_port)
4804+ return (glance_client, image_id)
4805+
4806+
4807+diff --git a/nova/tests/image/test_glance.py b/nova/tests/image/test_glance.py
4808+index bc5969a..8fa136a 100644
4809+--- a/nova/tests/image/test_glance.py
4810++++ b/nova/tests/image/test_glance.py
4811+@@ -578,6 +578,7 @@ class TestGlanceImageService(test.TestCase):
4812+ def test_glance_client_image_ref(self):
4813+ fixture = self._make_fixture(name='test image')
4814+ image_id = self.service.create(self.context, fixture)['id']
4815+- image_url = 'http://foo/%s' % image_id
4816++ image_url = 'http://something-less-likely/%s' % image_id
4817+ client, same_id = glance.get_glance_client(self.context, image_url)
4818+ self.assertEquals(same_id, image_id)
4819++ self.assertEquals(client.host, 'something-less-likely')
4820+--
4821+1.7.9.1
4822+
4823
4824=== added file 'debian/patches/upstream/0002-Stop-libvirt-test-from-deleting-instances-dir.patch'
4825--- debian/patches/upstream/0002-Stop-libvirt-test-from-deleting-instances-dir.patch 1970-01-01 00:00:00 +0000
4826+++ debian/patches/upstream/0002-Stop-libvirt-test-from-deleting-instances-dir.patch 2012-05-25 10:20:02 +0000
4827@@ -0,0 +1,69 @@
4828+From 4acfab6a7b368d34295afdace678563e1c3fa058 Mon Sep 17 00:00:00 2001
4829+From: Vishvananda Ishaya <vishvananda@gmail.com>
4830+Date: Thu, 5 Apr 2012 17:00:25 -0700
4831+Subject: [PATCH 2/5] Stop libvirt test from deleting instances dir
4832+
4833+ * fixes bug 974293
4834+
4835+Change-Id: Id41ab20193a70246ad2e3e1cc18edf47059d312d
4836+---
4837+ nova/tests/test_libvirt.py | 37 ++++++++++++-------------------------
4838+ 1 files changed, 12 insertions(+), 25 deletions(-)
4839+
4840+diff --git a/nova/tests/test_libvirt.py b/nova/tests/test_libvirt.py
4841+index 6b0f668..4ce91cb 100644
4842+--- a/nova/tests/test_libvirt.py
4843++++ b/nova/tests/test_libvirt.py
4844+@@ -2148,25 +2148,8 @@ class LibvirtConnectionTestCase(test.TestCase):
4845+ """Test for nova.virt.libvirt.connection.LibvirtConnection."""
4846+ def setUp(self):
4847+ super(LibvirtConnectionTestCase, self).setUp()
4848+-
4849+ self.libvirtconnection = connection.LibvirtConnection(read_only=True)
4850+
4851+- self.temp_path = os.path.join(flags.FLAGS.instances_path,
4852+- 'instance-00000001/', '')
4853+- try:
4854+- os.makedirs(self.temp_path)
4855+- except Exception:
4856+- print 'testcase init error'
4857+- pass
4858+-
4859+- def tearDown(self):
4860+- super(LibvirtConnectionTestCase, self).tearDown()
4861+-
4862+- try:
4863+- shutil.rmtree(flags.FLAGS.instances_path)
4864+- except Exception:
4865+- pass
4866+-
4867+ def _create_instance(self, params=None):
4868+ """Create a test instance"""
4869+ if not params:
4870+@@ -2374,11 +2357,15 @@ class LibvirtConnectionTestCase(test.TestCase):
4871+ self.stubs.Set(self.libvirtconnection, '_create_new_domain',
4872+ fake_create_new_domain)
4873+
4874+- ins_ref = self._create_instance()
4875+- libvirt_xml_path = os.path.join(flags.FLAGS.instances_path,
4876+- ins_ref['name'], 'libvirt.xml')
4877+- f = open(libvirt_xml_path, 'w')
4878+- f.close()
4879+-
4880+- ref = self.libvirtconnection.finish_revert_migration(ins_ref, None)
4881+- self.assertTrue(isinstance(ref, eventlet.event.Event))
4882++ with utils.tempdir() as tmpdir:
4883++ self.flags(instances_path=tmpdir)
4884++ ins_ref = self._create_instance()
4885++ os.mkdir(os.path.join(tmpdir, ins_ref['name']))
4886++ libvirt_xml_path = os.path.join(tmpdir,
4887++ ins_ref['name'],
4888++ 'libvirt.xml')
4889++ f = open(libvirt_xml_path, 'w')
4890++ f.close()
4891++
4892++ ref = self.libvirtconnection.finish_revert_migration(ins_ref, None)
4893++ self.assertTrue(isinstance(ref, eventlet.event.Event))
4894+--
4895+1.7.9.1
4896+
4897
4898=== added file 'debian/patches/upstream/0003-Allow-unprivileged-RADOS-users-to-access-rbd-volumes.patch'
4899--- debian/patches/upstream/0003-Allow-unprivileged-RADOS-users-to-access-rbd-volumes.patch 1970-01-01 00:00:00 +0000
4900+++ debian/patches/upstream/0003-Allow-unprivileged-RADOS-users-to-access-rbd-volumes.patch 2012-05-25 10:20:02 +0000
4901@@ -0,0 +1,155 @@
4902+From d4e96fe0294bd3d6e84a1d0a7e754662b23f8d13 Mon Sep 17 00:00:00 2001
4903+From: Josh Durgin <josh.durgin@dreamhost.com>
4904+Date: Wed, 4 Apr 2012 00:38:59 -0700
4905+Subject: [PATCH 3/5] Allow unprivileged RADOS users to access rbd volumes.
4906+
4907+This makes it possible to access rbd volumes with RADOS users with
4908+restricted privileges. Previously, the admin user was always used.
4909+
4910+This requires libvirt 0.9.8 or higher.
4911+
4912+This is a backport of commit 01f24caba86c987b0109f743979a4e99e8afed11
4913+from master.
4914+
4915+Fixes bug 975335.
4916+
4917+Change-Id: I3fbb2c03e5f63940c3a42f2d4f8d03ee16b30f7e
4918+diff -Naupr nova-2012.1.orig/Authors nova-2012.1/Authors
4919+--- nova-2012.1.orig/Authors 2012-04-04 14:29:56.000000000 -0400
4920++++ nova-2012.1/Authors 2012-04-12 12:49:23.608123414 -0400
4921+@@ -98,7 +98,7 @@ Jonathan Bryce <jbryce@jbryce.com>
4922+ Jordan Rinke <jordan@openstack.org>
4923+ Joseph Suh <jsuh@isi.edu>
4924+ Joseph W. Breu <breu@breu.org>
4925+-Josh Durgin <joshd@hq.newdream.net>
4926++Josh Durgin <josh.durgin@dreamhost.com>
4927+ Josh Kearney <josh@jk0.org>
4928+ Josh Kleinpeter <josh@kleinpeter.org>
4929+ Joshua Harlow <harlowja@yahoo-inc.com>
4930+diff -Naupr nova-2012.1.orig/nova/tests/test_libvirt.py nova-2012.1/nova/tests/test_libvirt.py
4931+--- nova-2012.1.orig/nova/tests/test_libvirt.py 2012-04-04 14:29:56.000000000 -0400
4932++++ nova-2012.1/nova/tests/test_libvirt.py 2012-04-12 12:49:23.612123413 -0400
4933+@@ -240,6 +240,57 @@ class LibvirtVolumeTestCase(test.TestCas
4934+ self.assertEqual(tree.find('./source').get('protocol'), 'rbd')
4935+ rbd_name = '%s/%s' % (FLAGS.rbd_pool, name)
4936+ self.assertEqual(tree.find('./source').get('name'), rbd_name)
4937++ self.assertEqual(tree.find('./source/auth'), None)
4938++ libvirt_driver.disconnect_volume(connection_info, mount_device)
4939++ connection_info = vol_driver.terminate_connection(vol, self.connr)
4940++
4941++ def test_libvirt_rbd_driver_auth_enabled(self):
4942++ vol_driver = volume_driver.RBDDriver()
4943++ libvirt_driver = volume.LibvirtNetVolumeDriver(self.fake_conn)
4944++ name = 'volume-00000001'
4945++ vol = {'id': 1, 'name': name}
4946++ connection_info = vol_driver.initialize_connection(vol, self.connr)
4947++ uuid = '875a8070-d0b9-4949-8b31-104d125c9a64'
4948++ user = 'foo'
4949++ secret_type = 'ceph'
4950++ connection_info['data']['auth_enabled'] = True
4951++ connection_info['data']['auth_username'] = user
4952++ connection_info['data']['secret_type'] = secret_type
4953++ connection_info['data']['secret_uuid'] = uuid
4954++ mount_device = "vde"
4955++ xml = libvirt_driver.connect_volume(connection_info, mount_device)
4956++ tree = ElementTree.fromstring(xml)
4957++ self.assertEqual(tree.get('type'), 'network')
4958++ self.assertEqual(tree.find('./source').get('protocol'), 'rbd')
4959++ rbd_name = '%s/%s' % (FLAGS.rbd_pool, name)
4960++ self.assertEqual(tree.find('./source').get('name'), rbd_name)
4961++ self.assertEqual(tree.find('./auth').get('username'), user)
4962++ self.assertEqual(tree.find('./auth/secret').get('type'), secret_type)
4963++ self.assertEqual(tree.find('./auth/secret').get('uuid'), uuid)
4964++ libvirt_driver.disconnect_volume(connection_info, mount_device)
4965++ connection_info = vol_driver.terminate_connection(vol, self.connr)
4966++
4967++ def test_libvirt_rbd_driver_auth_disabled(self):
4968++ vol_driver = volume_driver.RBDDriver()
4969++ libvirt_driver = volume.LibvirtNetVolumeDriver(self.fake_conn)
4970++ name = 'volume-00000001'
4971++ vol = {'id': 1, 'name': name}
4972++ connection_info = vol_driver.initialize_connection(vol, self.connr)
4973++ uuid = '875a8070-d0b9-4949-8b31-104d125c9a64'
4974++ user = 'foo'
4975++ secret_type = 'ceph'
4976++ connection_info['data']['auth_enabled'] = False
4977++ connection_info['data']['auth_username'] = user
4978++ connection_info['data']['secret_type'] = secret_type
4979++ connection_info['data']['secret_uuid'] = uuid
4980++ mount_device = "vde"
4981++ xml = libvirt_driver.connect_volume(connection_info, mount_device)
4982++ tree = ElementTree.fromstring(xml)
4983++ self.assertEqual(tree.get('type'), 'network')
4984++ self.assertEqual(tree.find('./source').get('protocol'), 'rbd')
4985++ rbd_name = '%s/%s' % (FLAGS.rbd_pool, name)
4986++ self.assertEqual(tree.find('./source').get('name'), rbd_name)
4987++ self.assertEqual(tree.find('./auth'), None)
4988+ libvirt_driver.disconnect_volume(connection_info, mount_device)
4989+ connection_info = vol_driver.terminate_connection(vol, self.connr)
4990+
4991+diff -Naupr nova-2012.1.orig/nova/virt/libvirt/volume.py nova-2012.1/nova/virt/libvirt/volume.py
4992+--- nova-2012.1.orig/nova/virt/libvirt/volume.py 2012-04-04 14:29:56.000000000 -0400
4993++++ nova-2012.1/nova/virt/libvirt/volume.py 2012-04-12 12:49:23.612123413 -0400
4994+@@ -76,11 +76,25 @@ class LibvirtNetVolumeDriver(LibvirtVolu
4995+ driver = self._pick_volume_driver()
4996+ protocol = connection_info['driver_volume_type']
4997+ name = connection_info['data']['name']
4998+- xml = """<disk type='network'>
4999+- <driver name='%s' type='raw' cache='none'/>
5000+- <source protocol='%s' name='%s'/>
The diff has been truncated for viewing.

Subscribers

People subscribed via source and target branches