Glance

Merge lp:~jaypipes/glance/ubuntu into lp:~openstack-ubuntu-packagers/glance/ubuntu

  1. ubuntu
  2. Merge into ubuntu
Proposed by Jay Pipes
Status: Merged
Approved by: Chuck Short
Approved revision: 74
Merged at revision: 72
Proposed branch: lp:~jaypipes/glance/ubuntu
Merge into: lp:~openstack-ubuntu-packagers/glance/ubuntu
Diff against target: 96 lines (+36/-18)
3 files modified
debian/changelog (+12/-0)
debian/control (+13/-18)
debian/patches/paste_router.patch (+11/-0)
To merge this branch: bzr merge lp:~jaypipes/glance/ubuntu
Reviewer Review Type Date Requested Status
Monty Taylor Approve
OpenStack Infra Pending
Review via email: mp+82318@code.launchpad.net

Description of the change

Should be merged when https://review.openstack.org/1619 is merged into trunk.

This cleans up the dependencies in the client packaging and updated the glance-api.conf to point the application entrypoint to new module.

To post a comment you must log in.
lp:~jaypipes/glance/ubuntu updated
73. By Jay Pipes

Update email in changelog

Revision history for this message
Monty Taylor (mordred) wrote :

Line 14 - stray * - just delete the line. Otherwise - kickass.

review: Needs Fixing
lp:~jaypipes/glance/ubuntu updated
74. By Jay Pipes

Remvoe extraneous * in changelog

Revision history for this message
Monty Taylor (mordred) wrote :

Great! Looks good to me.

review: Approve
Revision history for this message
Jay Pipes (jaypipes) wrote :

https://review.openstack.org/#change,1619

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2011-11-11 19:02:53 +0000
3+++ debian/changelog 2011-11-16 06:13:25 +0000
4@@ -1,3 +1,15 @@
5+glance (2012.1~e1~20110919.1021-0ubuntu1) natty; urgency=low
6+
7+ * New upstream release
8+
9+ [ Jay Pipes ]
10+ * Removes now-unnecessary dependencies from client package
11+ * Rewrote the description for the Glance project to remove
12+ ancient language about Teller and Parallax
13+ * Added a patch to update the paste entrypoint for the v1app
14+
15+ -- Jay Pipes <jaypipes@gmail.com> Tue, 15 Nov 2011 16:58:48 -0500
16+
17 glance (2012.1~e1~20110919.1021-0ubuntu0) oneiric; urgency=low
18
19 * New upstream release.
20
21=== modified file 'debian/control'
22--- debian/control 2011-11-11 19:02:53 +0000
23+++ debian/control 2011-11-16 06:13:25 +0000
24@@ -36,33 +36,28 @@
25 Section: python
26 Depends: ${python:Depends}, ${misc:Depends},
27 python-webob,
28- python-routes,
29- python-eventlet,
30- python-sqlalchemy-ext | python-sqlalchemy (<< 0.6.3-2),
31 python-pastedeploy,
32- python-migrate,
33 python-kombu,
34 python-httplib2 (>= 0.6.0),
35- python-crypto,
36- python-xattr
37+ python-crypto
38 Provides: ${python:Provides}
39 XB-Python-Version: ${python:Versions}
40-Description: OpenStack Image Registry and Delivery Service - Python library
41- The Glance project provides an image registration and discovery service
42- (Parallax) and an image delivery service (Teller). These services are used
43- in conjunction by Nova to deliver images from object stores, such as
44+Description: OpenStack Image Registry and Delivery Service - Python client library
45+ The Glance project provides an image registration, discovery and
46+ delivery service. These services may be used as stand-along services, and
47+ they may also be used by Nova to deliver images from object stores, such as
48 OpenStack's Swift service, to Nova's compute nodes.
49 .
50- This package contains the Python libraries.
51+ This package contains the Python client libraries.
52
53 Package: glance
54 Architecture: all
55 Section: python
56-Depends: ${python:Depends}, ${misc:Depends}, python-glance (= ${source:Version}), adduser, python-argparse
57+Depends: ${python:Depends}, ${misc:Depends}, python-glance (= ${source:Version}), adduser
58 Description: OpenStack Image Registry and Delivery Service - Daemons
59- The Glance project provides an image registration and discovery service
60- (Parallax) and an image delivery service (Teller). These services are used
61- in conjunction by Nova to deliver images from object stores, such as
62+ The Glance project provides an image registration, discovery and
63+ delivery service. These services may be used as stand-along services, and
64+ they may also be used by Nova to deliver images from object stores, such as
65 OpenStack's Swift service, to Nova's compute nodes.
66 .
67 This package contains the daemons.
68@@ -72,9 +67,9 @@
69 Section: doc
70 Depends: libjs-jquery, ${misc:Depends}
71 Description: OpenStack Image Registry and Delivery Service - Documentation
72- The Glance project provides an image registration and discovery service
73- (Parallax) and an image delivery service (Teller). These services are used
74- in conjunction by Nova to deliver images from object stores, such as
75+ The Glance project provides an image registration, discovery and
76+ delivery service. These services may be used as stand-along services, and
77+ they may also be used by Nova to deliver images from object stores, such as
78 OpenStack's Swift service, to Nova's compute nodes.
79 .
80 This package contains the documentation.
81
82=== added file 'debian/patches/paste_router.patch'
83--- debian/patches/paste_router.patch 1970-01-01 00:00:00 +0000
84+++ debian/patches/paste_router.patch 2011-11-16 06:13:25 +0000
85@@ -0,0 +1,11 @@
86+--- a/etc/glance-api.conf
87++++ b/etc/glance-api.conf
88+@@ -155,7 +155,7 @@
89+ paste.app_factory = glance.api.versions:app_factory
90+
91+ [app:apiv1app]
92+-paste.app_factory = glance.api.v1:app_factory
93++paste.app_factory = glance.api.v1.router:app_factory
94+
95+ [filter:versionnegotiation]
96+ paste.filter_factory = glance.api.middleware.version_negotiation:filter_factory

Subscribers

People subscribed via source and target branches