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