Merge lp:~james-page/cinder/grizzly-updates into lp:~openstack-ubuntu-testing/cinder/grizzly

[James Page]

Various updates for the cinder package; see the changelog for details.

[lp:~james-page/cinder/grizzly-updates]

68. By James Page on 2012-12-05

Minor tweak to control

=== modified file 'debian/changelog'
--- debian/changelog	2012-11-29 16:43:06 +0000
+++ debian/changelog	2012-12-05 17:31:22 +0000
@@ -1,9 +1,19 @@
 cinder (2013.1~g2~20121128.437-0ubuntu1) UNRELEASED; urgency=low
 
+  [ Chuck Short ]
   * New upstream release. 
   * debian/patches/avoid_setuptools_git_dependency.patch: Rediff
     due to upstream changes.
 
+  [ James Page ]
+  * Improve upstart configurations:
+    - d/*.upstart: Switch to using start-stop-daemon instead of su,
+      stop on [!2345] to catch all transitions.
+  * d/control: General tidy of package descriptions.
+  * d/control: Drop BD on python-all-dev as its not required.
+  * d/*.postrm: Dropped; update-rc.d calls for purge are handled by
+    debhelper and are not require for upstart configurations.
+
  -- Chuck Short <[e-mail]>  Thu, 29 Nov 2012 10:39:40 -0600
 
 cinder (2013.1~g1-0ubuntu1) raring; urgency=low

=== removed file 'debian/cinder-api.postrm'
--- debian/cinder-api.postrm	2012-08-10 16:54:44 +0000
+++ debian/cinder-api.postrm	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-#!/bin/sh -e
-
-if [ "$1" = purge ]; then
-	update-rc.d cinder-api remove
-fi
-
-#DEBHELPER#

=== modified file 'debian/cinder-api.upstart'
--- debian/cinder-api.upstart	2012-09-11 23:47:51 +0000
+++ debian/cinder-api.upstart	2012-12-05 17:31:22 +0000
@@ -2,7 +2,7 @@
 author "Chuck Short <[e-mail]>"
 
 start on runlevel [2345]
-stop on runlevel [016]
+stop on runlevel [!2345]
 
 chdir /var/run
 
@@ -14,4 +14,5 @@
     chown cinder:root /var/lock/cinder
 end script
 
-exec su -s /bin/sh -c "exec cinder-api --config-file=/etc/cinder/cinder.conf --log-file=/var/log/cinder/cinder-api.log" cinder
+exec start-stop-daemon --start --chuid cinder --exec /usr/bin/cinder-api \
+     -- --config-file=/etc/cinder/cinder.conf --log-file=/var/log/cinder/cinder-api.log

=== removed file 'debian/cinder-scheduler.postrm'
--- debian/cinder-scheduler.postrm	2012-08-10 16:54:44 +0000
+++ debian/cinder-scheduler.postrm	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-#!/bin/sh -e
-
-if [ "$1" = purge ]; then
-	update-rc.d cinder-scheduler remove
-fi
-
-#DEBHELPER#

=== modified file 'debian/cinder-scheduler.upstart'
--- debian/cinder-scheduler.upstart	2012-09-11 23:13:08 +0000
+++ debian/cinder-scheduler.upstart	2012-12-05 17:31:22 +0000
@@ -2,7 +2,7 @@
 author "Chuck Short <[e-mail]>"
 
 start on runlevel [2345]
-stop on runlevel [016]
+stop on runlevel [!2345]
 
 chdir /var/run
 
@@ -14,4 +14,5 @@
     chown cinder:root /var/lock/cinder
 end script
 
-exec su -s /bin/sh -c "exec cinder-scheduler --config-file=/etc/cinder/cinder.conf --log-file=/var/log/cinder/cinder-scheduler.log" cinder
+exec start-stop-daemon --start --chuid cinder --exec /usr/bin/cinder-scheduler \
+     -- --config-file=/etc/cinder/cinder.conf --log-file=/var/log/cinder/cinder-scheduler.log

=== removed file 'debian/cinder-volume.postrm'
--- debian/cinder-volume.postrm	2012-08-10 16:54:44 +0000
+++ debian/cinder-volume.postrm	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-#!/bin/sh -e
-
-if [ "$1" = purge ]; then
-	update-rc.d cinder-volume remove
-fi
-
-#DEBHELPER#

=== modified file 'debian/cinder-volume.upstart'
--- debian/cinder-volume.upstart	2012-09-11 23:47:51 +0000
+++ debian/cinder-volume.upstart	2012-12-05 17:31:22 +0000
@@ -2,7 +2,7 @@
 author "Chuck Short <[e-mail]>"
 
 start on runlevel [2345]
-stop on runlevel [016]
+stop on runlevel [!2345]
 
 chdir /var/run
 
@@ -14,4 +14,5 @@
     chown cinder:root /var/lock/cinder
 end script
 
-exec su -s /bin/sh -c "exec cinder-volume --config-file=/etc/cinder/cinder.conf --log-file=/var/log/cinder/cinder-volume.log" cinder
+exec start-stop-daemon --start --chuid cinder --exec /usr/bin/cinder-volume \
+     -- --config-file=/etc/cinder/cinder.conf --log-file=/var/log/cinder/cinder-volume.log

=== modified file 'debian/control'
--- debian/control	2012-10-12 10:00:00 +0000
+++ debian/control	2012-12-05 17:31:22 +0000
@@ -3,8 +3,7 @@
 Priority: extra
 Maintainer: Chuck Short <[e-mail]>
 Build-Depends: debhelper (>= 8.0.0),
- python-all (>= 2.6),
- python-all-dev (>= 2.6.6-3~)
+ python-all (>= 2.6)
 Build-Depends-Indep:
  python-sqlalchemy,
  python-setuptools,
@@ -64,27 +63,42 @@
  python-iso8601,
  python-glanceclient,
  ${misc:Depends}
-Description: Cinder python libraries
- Cinder is a storage service for the Openstack project.
- .
- This package contains the proython parts of cinder.
+Description: Cinder Python libraries
+ OpenStack is a reliable cloud infrastructure. Its mission is to produce
+ the ubiquitous cloud computing platform that will meet the needs of public
+ and private cloud providers regardless of size, by being simple to implement
+ and massively scalable.
+ .
+ Cinder is the OpenStack Block storage service.
+ .
+ This package contains the Python library for Cinder.
 
 Package: cinder-common
 Architecture: all
 Depends: python-cinder (= ${binary:Version}), ${python:Depends}, ${misc:Depends}, adduser
 Provides: ${python:Provides}
-Description: Cinder starage service - common files
- Cinder is a storage service for the Openstack project
- .
- This package contains things that are needed for all parts of cinder
+Description: Cinder storage service - common files
+ OpenStack is a reliable cloud infrastructure. Its mission is to produce
+ the ubiquitous cloud computing platform that will meet the needs of public
+ and private cloud providers regardless of size, by being simple to implement
+ and massively scalable.
+ .
+ Cinder is the OpenStack Block storage service.
+ .
+ This package contains commons components for Cinder.
 
 Package: cinder-api
 Architecture: all
 Depends: cinder-common (= ${binary:Version}), ${python:Depends}, ${misc:Depends}
-Description: Cinder storage service - api server
- Cinder is a storage service for the Openstack project
- .
- This package contains the api server
+Description: Cinder storage service - API server
+ OpenStack is a reliable cloud infrastructure. Its mission is to produce
+ the ubiquitous cloud computing platform that will meet the needs of public
+ and private cloud providers regardless of size, by being simple to implement
+ and massively scalable.
+ .
+ Cinder is the OpenStack Block storage service.
+ .
+ This package contains the Cinder API server.
 
 Package: cinder-volume
 Architecture: all
@@ -96,15 +110,25 @@
 Suggests: ceph-common
 Breaks: cinder-common ( <= 2012.2~rc1~20120907.1154-0ubuntu1 )
 Replaces: cinder-common ( <= 2012.2~rc1~20120907.1154-0ubuntu1 )
-Description: Cinder storage service - api server
- Cinder is a storage service for the Openstack project
- .
- This package contains the volume server
+Description: Cinder storage service - Volume server
+ OpenStack is a reliable cloud infrastructure. Its mission is to produce
+ the ubiquitous cloud computing platform that will meet the needs of public
+ and private cloud providers regardless of size, by being simple to implement
+ and massively scalable.
+ .
+ Cinder is the OpenStack Block storage service.
+ .
+ This package contains the Cinder Volume server.
 
 Package: cinder-scheduler
 Architecture: all
 Depends: cinder-common (= ${binary:Version}), ${python:Depends}, ${misc:Depends}
-Description: Cinder storage service - api server
- Cinder is a storage service for the Openstack project
- .
- This package contains the scheduler server
+Description: Cinder storage service - Scheduler server
+ OpenStack is a reliable cloud infrastructure. Its mission is to produce
+ the ubiquitous cloud computing platform that will meet the needs of public
+ and private cloud providers regardless of size, by being simple to implement
+ and massively scalable.
+ .
+ Cinder is the OpenStack Block storage service.
+ .
+ This package contains the Cinder Scheduler server.