Merge lp:~zulcss/ubuntu/saucy/cinder/2013.2.2 into lp:~ubuntu-server-dev/cinder/grizzly

[Chuck Short]

2013.2.2

[lp:~zulcss/ubuntu/saucy/cinder/2013.2.2]

153. By Chuck Short on 2014-02-25

Re-add missing bits

Unmerged revisions

153. By Chuck Short on 2014-02-25

Re-add missing bits

152. By Chuck Short on 2014-02-25

Releasing 2013.2.2

151. By Adam Gandelman on 2014-01-02

2013.2.1

150. By Adam Gandelman on 2013-12-18

d/changelog: typo

149. By Adam Gandelman on 2013-12-18

debian/pathces/revert-stable-havana-requirements.patch: Revert
version bumps to dependencies in stable/havana back to what was
shipped with Saucy.

148. By Adam Gandelman on 2013-12-18

d/patches: 2013.2.1 refresh

147. By Chuck Short on 2013-10-17

2013.2

146. By James Page on 2013-10-16

releasing package cinder version 1:2013.2~rc3-0ubuntu1

145. By James Page on 2013-10-12

releasing package cinder version 1:2013.2~rc2-0ubuntu1

144. By Chuck Short on 2013-10-04

2013.2~rc1

=== modified file 'debian/changelog'
--- debian/changelog	2013-10-18 19:14:58 +0000
+++ debian/changelog	2014-02-25 15:15:47 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 cinder (1:2013.1.4-0ubuntu1) raring-proposed; urgency=low
 
   * Resynchronize with stable/grizzly (6e764cb) (LP: #1241202):
@@ -118,6 +119,212 @@
 
  -- Adam Gandelman <[e-mail]>  Tue, 14 May 2013 07:49:04 -0700
 
+=======
+cinder (1:2013.2.2-0ubuntu1) saucy-proposed; urgency=low
+
+  * Resynchronize with stable/havana (67e4b38) (LP: #1284643):
+    - [ec8ce6c] rate-limiting doesn't work LP: 1259957
+    - [5228001] Cinder Migrate from NFS fails due to nfs_mount_point_base not
+      being provided LP: 1238085
+    - [ace214a] migrate_volume dest_vg existence is wrong LP: 1258203
+    - [36b7596] lvm_mirrors in volume_migration should be converted to int
+      LP: 1258133
+    - [6687331] NFS/GlusterFS drivers should validate format of configured
+      shares LP: 1267253
+    - [3d967e0] Copy image to volume iSCSI multipath doesn't work properly if
+      there are different targets associated with different portals for a
+      mulitpath device. LP: 1266048
+    - [77fade5] NetApp cinder driver reports 0 free space for the first 60
+      seconds LP: 1253660
+    - [f02d4fe] GlusterFS: allow snapshot_delete when snapshot info does not
+      exist LP: 1252864
+    - [240c81d] GlusterFS: Use correct base argument when deleting attached
+      snaps LP: 1262880
+    - [4470fdb] No notification sent deleting a volume that doesn't have a real
+      backing volume LP: 1257053
+    - [f9e1943] cinder does not handle missing volume group gracefully (stuck
+      in "creating") LP: 1242942
+    - [ab12130] Bump stable/havana next version to 2013.2.3
+    - [8b5fb84] Bump stable/havana next version to 2013.2.2
+    - [67e4b38] LVM brick instantiation fails on volume_migration LP: 1258128
+
+ -- Chuck Short <[e-mail]>  Tue, 25 Feb 2014 08:57:25 -0500
+
+cinder (1:2013.2.1-0ubuntu1) saucy-proposed; urgency=low
+
+  * Resynchronize with stable/havana (eb78fee) (LP: #1262788):
+    - [d8a0cd9] GlusterFS: errors when trying to boot instance from cloned
+      volume LP: 1244238
+    - [550f439] SSC attribute netapp_mirrored is not followed LP: 1242808
+    - [0d3c303] SSC attributes netapp_compression and netapp_dedup are not
+      followed LP: 1236839
+    - [243ad85] Brick HostDriver test failure LP: 1244418
+    - [42f3e68] SSC volume filtering for extra specs can result in inconsistent
+      list LP: 1243081
+    - [2e5dc22] Broken NetAppDirect7modeISCSIDriver reports incorrect free
+      capacity, scheduler won't balance between multiple Netapp backends
+      LP: 1238967
+    - [ad05556] copy image to volume is broken for non-local volumes
+      LP: 1243980
+    - [5f7d263] check_ssh_injection not handling quoted args correctly
+      LP: 1244415
+    - [709130b] don't secure delete thin provisioned volumes or snapshots
+      LP: 1240299
+    - [986d243] invalid volume when source image virtual size is bigger than
+      the requested size LP: 1235358
+    - [df6d45f] invalid volume when source image virtual size is bigger than
+      the requested size LP: 1235358
+    - [78609c1] Properly handle volume cleanup with RBD driver LP: 1254318
+    - [0801927] KeyError from storwize driver when 'host' is not provided to
+      terminate_connection LP: 1244257
+    - [e96e33c] GlusterFS: cloned volume has incorrect permissions LP: 1254768
+    - [4529886] GlusterFS: operations that modify data require locking
+      LP: 1251425
+    - [3a58261] cinder backup should use pipe for diff transfer LP: 1244464
+    - [3591f0d] Havana cinder requires glance API V2 LP: 1252549
+    - [871d7d6] Excessive queries for API volumes/detail extensions LP: 1197612
+    - [22a7101] Ensure ThinLVM LV is active when cloning LP: 1252423
+    - [c5d4246] Excessive queries for API volumes/detail extensions LP: 1197612
+    - [395ec74] Excessive queries for API volumes/detail extensions LP: 1197612
+    - [1825386] Excessive queries for API volumes/detail extensions LP: 1197612
+    - [430f0b9] [messaging] QPID broadcast RPC requests to all servers for a
+      given topic LP: 1257293
+    - [eb78fee] Updated from global requirements
+
+ -- Adam Gandelman <[e-mail]>  Thu, 19 Dec 2013 11:45:31 -0800
+
+cinder (1:2013.2-0ubuntu1) saucy; urgency=low
+
+  * New upstream release (LP: #1236462).
+
+ -- Chuck Short <[e-mail]>  Thu, 17 Oct 2013 10:00:43 -0400
+
+cinder (1:2013.2~rc3-0ubuntu1) saucy; urgency=low
+
+  * New upstream release candidate (LP: #1240254).
+
+ -- James Page <[e-mail]>  Wed, 16 Oct 2013 08:59:28 +0100
+
+cinder (1:2013.2~rc2-0ubuntu1) saucy; urgency=low
+
+  * New upstream release candidate (LP: #1239156). 
+
+ -- James Page <[e-mail]>  Sat, 12 Oct 2013 16:52:11 +0100
+
+cinder (1:2013.2~rc1-0ubuntu1) saucy; urgency=low
+
+  * New upstream release candidate.
+  * debian/patches/skip-sqlachemy-failures.patch: Dropped
+  * debian/patches/fix-sqlalchemy-requirements.patch: Refreshed.
+  * debian/patches/fix-babel-requirements.patch: Revert dependency requirement
+    for python-babel.
+  * debian/control:
+    - Dropped python-nose and python-setuptool-git.
+    - Added python-netaddr as a build-dependency. (LP: #1227153)
+    - Added python-six as a build-dependency.
+    - Added versioned dependencies to python-pbr, python-amqplib,
+      python-glanceclient, python-novaclient, and python-swiftclient,
+      python-lxml, python-webob, python-oslo.config, python-sqlalchemy,
+      python-fixtures, python-testtools, and python-fixtures
+    - Bumped versioned dependencies for python-eventlet, python-hp3parclient,
+      python-keystoneclient, and python-novaclient
+
+ -- Chuck Short <[e-mail]>  Fri, 04 Oct 2013 08:40:26 -0400
+
+cinder (1:2013.2~b3-0ubuntu1) saucy; urgency=low
+
+  [ James Page ]
+  * d/control: Switch ceph-common -> python-ceph inline with upstream
+    refactoring of Ceph RBD driver, move to Suggests of python-cinder.
+    (LP: #1190791). 
+
+  [ Adam Gandelman ]
+  * debian/patches/avoid_paramiko_vers_depends.patch: Dropped, no longer
+    required.
+  * Add minimum requirement python-greenlet (>= 0.3.2).
+  * Add minimum requirement python-eventlet (>= 0.12.0).
+  * Add minimum requirement python-paramiko (>= 1.8).
+
+  [ Chuck Short ]
+  * New upstream release.
+  * debian/patches/skip-sqlachemy-failures.patch: Skip testfailures
+    with sqlalchemy 0.8 until they are fixed upstream.
+  * debian/control: Add python-babel to build-depends.
+  * debian/control: Add python-novaclient to build-depends.
+
+ -- Chuck Short <[e-mail]>  Sun, 08 Sep 2013 21:09:46 -0400
+
+cinder (1:2013.2~b2-0ubuntu3) saucy; urgency=low
+
+  * debian/patches/fix-sqlalchemy-requirements.patch: Fix requirements for sqlalchemy
+    0.8.
+
+ -- Chuck Short <[e-mail]>  Mon, 22 Jul 2013 10:03:52 -0400
+
+cinder (1:2013.2~b2-0ubuntu2) saucy; urgency=low
+
+  * d/rules: Disable test parallel execution; causing FTBFS when high
+    levels of concurrency occur on buildds. 
+
+ -- James Page <[e-mail]>  Sun, 21 Jul 2013 10:10:10 +0100
+
+cinder (1:2013.2~b2-0ubuntu1) saucy; urgency=low
+
+  [ Chuck Short ]
+  * debian/patches/avoid_paramiko_vers_depends.patch: Refreshed
+  * debian/control: Add missing testrepostory.
+  * debian/rules: Use testr directly.
+
+  [ Adam Gandelman ]
+  * debian/control:
+    - Add minimum requirement python-anyjson (>= 0.3.3).
+    - Add minimum requirement python-keystoneclient (>= 0.2.3).
+    - Add minimum requirement python-kombu (>= 2.5.12).
+
+  [ James Page ]
+  * New upstream release.
+  * d/control: Update VCS fields for new branch locations.
+  * d/rules: Run unit tests in parallel.
+
+ -- James Page <[e-mail]>  Fri, 19 Jul 2013 14:14:40 +0100
+
+cinder (1:2013.2~b1-0ubuntu2) saucy; urgency=low
+
+  [ Chuck Short ]
+  * debian/patches/avoid_paramiko_vers_depends.patch: Refreshed
+
+  [ Adam Gandelman ]
+  * debian/control: Bump min. stevedore version >= 0.9.
+ 
+  [Yolanda Robla]
+  * debian/tests: Added autopkgtests.
+
+ -- Chuck Short <[e-mail]>  Wed, 19 Jun 2013 12:45:18 -0500
+
+cinder (1:2013.2~b1-0ubuntu1) saucy; urgency=low
+
+  [ Chuck Short ]
+  * New upstream version.
+  * debian/patches/fix_cinder_dependencies.patch: Dropped.
+  * debian/control: Bump standards version to 3.9.4.
+  * debian/control: Add python-pbr and python-d2to1 to build-depends.
+  * debian/control: Add python-testtools and python-fixtures to build-depends
+  * debian/rules: Add work around to remove wonky setup.py setup
+  * debian/cinder-common.install: Add cinder-rpc-zmq-receiver binary.
+
+  [ James Page ]
+  * debian/control: Drop surplus dependency on python-glance (LP: #1175600).
+  * debian/control,rules: Drop dependency on pep8, don't run pep8 tests during
+    package build process (its just way to late).
+  * debian/control: Drop surplus BD on python-cheetah.
+
+  [ Adam Gandelman ]
+  * debian/patches/avoid_paramiko_vers_depends.patch: Avoid version
+    requirement on paramiko.
+
+ -- Chuck Short <[e-mail]>  Fri, 31 May 2013 10:01:03 -0500
+
+>>>>>>> MERGE-SOURCE
 cinder (1:2013.1-0ubuntu2) raring; urgency=low
 
   * debian/control: Bump minimum stevedore version 0.8.
 
=== modified file 'debian/cinder-common.install'
--- debian/cinder-common.install	2013-02-20 10:31:01 +0000
+++ debian/cinder-common.install	2014-02-25 15:15:47 +0000
@@ -6,3 +6,4 @@
 etc/cinder/rootwrap.conf etc/cinder
 usr/bin/cinder-manage
 usr/bin/cinder-rootwrap
+usr/bin/cinder-rpc-zmq-receiver
 
=== modified file 'debian/control'
--- debian/control	2013-08-14 17:39:08 +0000
+++ debian/control	2014-02-25 15:15:47 +0000
@@ -4,72 +4,86 @@
 Maintainer: Chuck Short <[e-mail]>
 Build-Depends: debhelper (>= 8.0.0), python-all (>= 2.6)
 Build-Depends-Indep:
- pep8,
- python-amqplib,
- python-anyjson,
- python-cheetah,
+ python-amqplib (>= 0.6.1),
+ python-anyjson (>= 0.3.3),
+ python-babel,
  python-coverage,
- python-eventlet,
- python-glanceclient,
- python-greenlet,
- python-hp3parclient (>= 1.0.0),
+ python-d2to1,
+ python-eventlet (>= 0.13.0),
+ python-fixtures (>= 0.3.14),
+ python-glanceclient (>= 1:0.9.0),
+ python-greenlet (>= 0.3.2),
+ python-hp3parclient (>= 2.0.0),
  python-iso8601,
- python-keystoneclient,
- python-kombu,
+ python-keystoneclient (>= 1:0.3.0),
+ python-kombu (>= 2.5.12),
  python-lockfile,
- python-lxml,
+ python-lxml (>= 2.3),
  python-migrate,
  python-mock,
  python-mox,
  python-mysqldb,
- python-nose,
- python-oslo.config,
- python-paramiko,
+ python-netaddr,
+ python-novaclient (>= 1:2.15.0),
+ python-oslo.config (>= 1:1.1.0),
+ python-paramiko (>= 1.8),
  python-paste,
  python-pastedeploy,
+ python-pbr (>= 0.5.21),
  python-routes,
- python-swiftclient,
  python-setuptools,
- python-setuptools-git,
+ python-six,
  python-sphinx,
- python-sqlalchemy,
- python-stevedore (>= 0.8),
+ python-sqlalchemy (>= 0.8.2),
+ python-stevedore (>= 0.10),
  python-suds,
- python-webob
-Standards-Version: 3.9.3
+ python-swiftclient (>= 1:1.5),
+ python-testtools (>= 0.9.32),
+ python-webob (>= 1.2.3),
+ testrepository (>= 0.0.17)
+Standards-Version: 3.9.4
 Homepage: http://launchpad.net/cinder
+<<<<<<< TREE
 Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-server-dev/cinder/grizzly/files
 Vcs-Bzr: https://code.launchpad.net/~ubuntu-server-dev/cinder/grizzly
+=======
+Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-server-dev/cinder/havana/files
+Vcs-Bzr: https://code.launchpad.net/~ubuntu-server-dev/cinder/havana
+XS-Testsuite: autopkgtest
+>>>>>>> MERGE-SOURCE
 
 Package: python-cinder
 Section: python
 Architecture: all
 Depends:
- python-amqplib,
- python-anyjson,
- python-eventlet,
- python-glance,
- python-glanceclient,
- python-keystoneclient,
- python-oslo.config,
- python-greenlet,
+ python-amqplib (>= 0.6.1),
+ python-anyjson (>= 0.3.3),
+ python-babel,
+ python-eventlet (>= 0.13.0),
+ python-glanceclient (>= 1:0.9.0),
+ python-greenlet (>= 0.3.2),
  python-iso8601,
- python-kombu,
+ python-keystoneclient (>= 1:0.3.0),
+ python-kombu (>= 2.5.12),
  python-lockfile,
- python-lxml,
+ python-lxml (>= 2.3),
  python-migrate,
- python-paramiko,
+ python-netaddr,
+ python-novaclient (>= 1:2.12.0),
+ python-oslo.config (>= 1:1.1.0),
+ python-paramiko (>= 1.8),
  python-paste,
  python-pastedeploy,
  python-routes,
- python-stevedore (>= 0.8),
- python-swiftclient,
- python-sqlalchemy,
+ python-six,
+ python-sqlalchemy (>= 0.8.2),
+ python-stevedore (>= 0.10),
  python-suds,
- python-webob,
+ python-swiftclient (>= 1:1.5),
+ python-webob (>= 1.2.3),
  ${misc:Depends},
  ${python:Depends}
-Suggests: python-hp3parclient
+Suggests: python-ceph, python-hp3parclient
 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
@@ -119,7 +133,6 @@
  tgt,
  ${misc:Depends},
  ${python:Depends}
-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 - Volume server
 
=== added file 'debian/patches/fix-sqlalchemy-requirements.patch'
--- debian/patches/fix-sqlalchemy-requirements.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/fix-sqlalchemy-requirements.patch	2014-02-25 15:15:47 +0000
@@ -0,0 +1,15 @@
+Index: cinder/requirements.txt
+===================================================================
+--- cinder.orig/requirements.txt	2013-12-17 19:54:20.811733048 -0800
++++ cinder/requirements.txt	2013-12-17 20:00:20.879729788 -0800
+@@ -19,8 +19,8 @@
+ python-novaclient>=2.15.0
+ python-swiftclient>=1.5
+ Routes>=1.12.3
+-six>=1.4.1
+-SQLAlchemy>=0.7.8,<=0.7.99
++six
++SQLAlchemy>=0.7.8,<=0.8.99
+ sqlalchemy-migrate>=0.7.2
+ stevedore>=0.10
+ suds>=0.4
 
=== removed file 'debian/patches/fix_cinder_dependencies.patch'
--- debian/patches/fix_cinder_dependencies.patch	2013-02-22 16:40:10 +0000
+++ debian/patches/fix_cinder_dependencies.patch	1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-diff -Naurp cinder-2013.1.g3.orig/tools/pip-requires cinder-2013.1.g3/tools/pip-requires
---- cinder-2013.1.g3.orig/tools/pip-requires	2013-02-21 16:08:48.000000000 -0600
-+++ cinder-2013.1.g3/tools/pip-requires	2013-02-22 10:38:34.786411293 -0600
-@@ -18,7 +18,6 @@ suds>=0.4
- paramiko
- Babel>=0.9.6
- iso8601>=0.1.4
--setuptools_git>=0.4
- python-glanceclient>=0.5.0,<2
- python-keystoneclient>=0.2.0
- python-swiftclient
 
=== added file 'debian/patches/revert-stable-havana-requirements.patch'
--- debian/patches/revert-stable-havana-requirements.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/revert-stable-havana-requirements.patch	2014-02-25 15:15:47 +0000
@@ -0,0 +1,25 @@
+Author: Adam Gandelman <[e-mail]>
+Date: Wed Dec 18 10:06:25 PST 2013
+Subject: Reverts stable/havana version bumps to requirements.txt
+
+Reverts various version bumps to dependencies in stable/havana that
+were updated in global requirements to fix gating issues and synced
+across projects.
+
+Index: cinder/requirements.txt
+===================================================================
+--- cinder.orig/requirements.txt	2013-12-18 10:11:29.047267359 -0800
++++ cinder/requirements.txt	2013-12-18 10:14:33.963265684 -0800
+@@ -2,10 +2,10 @@
+ amqplib>=0.6.1
+ anyjson>=0.3.3
+ argparse
+-Babel>=1.3
++Babel>=0.9.6
+ eventlet>=0.13.0
+ greenlet>=0.3.2
+-iso8601>=0.1.8
++iso8601>=0.1.4
+ kombu>=2.4.8
+ lockfile>=0.8
+ lxml>=2.3
 
=== added file 'debian/patches/series'
--- debian/patches/series	1970-01-01 00:00:00 +0000
+++ debian/patches/series	2014-02-25 15:15:47 +0000
@@ -0,0 +1,2 @@
+fix-sqlalchemy-requirements.patch
+revert-stable-havana-requirements.patch
 
=== removed file 'debian/patches/series'
--- debian/patches/series	2013-02-25 17:37:22 +0000
+++ debian/patches/series	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-fix_cinder_dependencies.patch
 
=== modified file 'debian/rules'
--- debian/rules	2013-08-09 10:19:08 +0000
+++ debian/rules	2014-02-25 15:15:47 +0000
@@ -3,10 +3,6 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-DEBVERS ?= $(shell dpkg-parsechangelog | sed -n -e 's/^Version: //p')
-VERSION ?= $(shell echo '$(DEBVERS)' | sed -e 's/^[[:digit:]]*://' -e 's/[-].*//')
-export OSLO_PACKAGE_VERSION=$(VERSION)
-
 %:
 	dh $@  --with python2
 
@@ -15,7 +11,7 @@
 
 ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
 override_dh_auto_test:
-	PYTHONPATH=$(CURDIR) bash run_tests.sh -N -v
+	testr init && testr run
 endif
 
 override_dh_install:
@@ -23,7 +19,14 @@
 
 override_dh_fixperms:
 	dh_fixperms -Xcinder_tgt.conf
+<<<<<<< TREE
 
 override_dh_clean:
 	dh_auto_clean
 	rm -rf setuptools_git*.egg
+=======
+
+override_dh_clean:
+	# temporary workaround for d2to1 wonkyness
+	dh_clean -Xsetup.cfg
+>>>>>>> MERGE-SOURCE
 
=== added directory 'debian/tests'
=== added file 'debian/tests/cinder-daemons'
--- debian/tests/cinder-daemons	1970-01-01 00:00:00 +0000
+++ debian/tests/cinder-daemons	2014-02-25 15:15:47 +0000
@@ -0,0 +1,15 @@
+#!/bin/bash
+#-----------------------
+# Testing cinder-daemons
+#-----------------------
+set -e
+DAEMONS=('cinder-api' 'cinder-scheduler')
+
+for daemon in "${DAEMONS[@]}"; do
+    if pidof -x $daemon > /dev/null; then
+        echo "OK"
+    else
+        echo "ERROR: ${daemon} IS NOT RUNNING"
+        exit 1
+    fi
+done
 
=== added file 'debian/tests/cinder-volume'
--- debian/tests/cinder-volume	1970-01-01 00:00:00 +0000
+++ debian/tests/cinder-volume	2014-02-25 15:15:47 +0000
@@ -0,0 +1,17 @@
+#!/bin/bash
+#----------------------
+# Testing cinder-volume
+#----------------------
+set -e
+apt-get install -y cinder-volume cinder-backup 2>&1 > /dev/null
+DAEMONS=('cinder-volume' 'cinder-backup')
+
+for daemon in "${DAEMONS[@]}"; do
+    if pidof -x $daemon > /dev/null; then
+        echo "OK"
+    else
+        echo "ERROR: ${daemon} IS NOT RUNNING"
+        exit 1
+    fi
+done
+apt-get remove -y cinder-volume cinder-backup 2>&1 > /dev/null
 
=== added file 'debian/tests/control'
--- debian/tests/control	1970-01-01 00:00:00 +0000
+++ debian/tests/control	2014-02-25 15:15:47 +0000
@@ -0,0 +1,3 @@
+Tests: python-cinder cinder-daemons cinder-volume
+Depends: python-cinder, cinder-api, cinder-scheduler, lvm2
+Restrictions: needs-root
 
=== added file 'debian/tests/python-cinder'
--- debian/tests/python-cinder	1970-01-01 00:00:00 +0000
+++ debian/tests/python-cinder	2014-02-25 15:15:47 +0000
@@ -0,0 +1,14 @@
+#!/bin/bash
+#-------------------------
+# Testing client utilities
+#-------------------------
+set -e
+
+result=$(python `dirname $0`/test_import_cinder.py 2>&1)
+if [ "$result" ]; then
+    echo "ERROR: PYTHON-CINDER MODULE CANNOT BE IMPORTED"
+    exit 1
+else
+    echo "OK"
+    exit 0
+fi
 
=== added file 'debian/tests/test_import_cinder.py'
--- debian/tests/test_import_cinder.py	1970-01-01 00:00:00 +0000
+++ debian/tests/test_import_cinder.py	2014-02-25 15:15:47 +0000
@@ -0,0 +1,4 @@
+try:
+    import cinder
+except ImportError, e:
+    print "ERROR IMPORTING MODULE"