[python-cinderclient/el6] Update to 1.0.1 pypi sources.

[Jakub Ruzicka]

commit c876ca13806822a530a04e2efa24154a2a74b7a0
Author: Jakub Ruzicka <jruzicka at redhat.com>
Date:   Tue Mar 19 07:55:27 2013 -0700

    Update to 1.0.1 pypi sources.

 .gitignore                                         |    4 +-
 ...ty-to-call-force_delete-from-cinderclient.patch |   70 ++++++++++++++++++++
 python-cinderclient.spec                           |   13 +++-
 sources                                            |    2 +-
 4 files changed, 82 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 50a76a7..7f98b65 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1 @@
-/python-cinderclient-0.2.tar.gz
-/python-cinderclient-0.2.26~20120925git.tar.gz
-/python-cinderclient-0.2.26.tar.gz
+/python-cinderclient-1.0.1.tar.gz
diff --git a/0001-Add-ability-to-call-force_delete-from-cinderclient.patch b/0001-Add-ability-to-call-force_delete-from-cinderclient.patch
new file mode 100644
index 0000000..becb992
--- /dev/null
+++ b/0001-Add-ability-to-call-force_delete-from-cinderclient.patch
@@ -0,0 +1,70 @@
+From d56cfa233db02f5b3fd5a359385c9bf7506ee643 Mon Sep 17 00:00:00 2001
+From: john-griffith <john.griffith at solidfire.com>
+Date: Fri, 18 Jan 2013 16:55:01 -0700
+Subject: [PATCH] Add ability to call force_delete from cinderclient
+
+We have an admin extension to do this however we never
+exposed it via the cinderclient.
+
+This change simply enables access to force-delete for admins.
+
+(cherry picked from commit 07ff48f1de5507faac197f463b418d78c9fd4e92)
+
+Conflicts:
+	cinderclient/v1/volumes.py
+
+Resolves: rhbz#888987
+Change-Id: Ia066d7dd06ccdb9b3a9221cf33086437624e65d8
+Reviewed-on: https://code.engineering.redhat.com/gerrit/3230
+Tested-by: Eric Harney <eharney at redhat.com>
+Reviewed-by: Padraig Brady <pbrady at redhat.com>
+Tested-by: Padraig Brady <pbrady at redhat.com>
+---
+ cinderclient/v1/shell.py   |  8 ++++++++
+ cinderclient/v1/volumes.py | 10 ++++++++++
+ 2 files changed, 18 insertions(+)
+
+diff --git a/cinderclient/v1/shell.py b/cinderclient/v1/shell.py
+index 3b85c40..beb6e89 100644
+--- a/cinderclient/v1/shell.py
++++ b/cinderclient/v1/shell.py
+@@ -244,6 +244,14 @@ def do_delete(cs, args):
+     volume.delete()
+ 
+ 
++ at utils.arg('volume', metavar='<volume>', help='ID of the volume to delete.')
++ at utils.service_type('volume')
++def do_force_delete(cs, args):
++    """Attempt forced removal of a volume, regardless of it's state."""
++    volume = _find_volume(cs, args.volume)
++    volume.force_delete()
++
++
+ @utils.arg('volume', metavar='<volume>', help='ID of the volume to rename.')
+ @utils.arg('display_name', nargs='?', metavar='<display-name>',
+            help='New display-name for the volume.')
+diff --git a/cinderclient/v1/volumes.py b/cinderclient/v1/volumes.py
+index fb98418..59eb495 100644
+--- a/cinderclient/v1/volumes.py
++++ b/cinderclient/v1/volumes.py
+@@ -95,6 +95,13 @@ class Volume(base.Resource):
+         """
+         return self.manager.terminate_connection(self, connector)
+ 
++    def force_delete(self):
++        """
++        Delete the specififed volume ignoring it's current state.
++
++        :param volume: The UUID of the volume to force-delete.
++        """
++        self.manager.force_delete(self)
+ 
+ class VolumeManager(base.ManagerWithFind):
+     """
+@@ -284,3 +291,6 @@ class VolumeManager(base.ManagerWithFind):
+         """
+         self._action('os-terminate_connection', volume,
+                      {'connector': connector})
++
++    def force_delete(self, volume):
++        return self._action('os-force_delete', base.getid(volume))
diff --git a/python-cinderclient.spec b/python-cinderclient.spec
index 961a312..539aee0 100644
--- a/python-cinderclient.spec
+++ b/python-cinderclient.spec
@@ -1,16 +1,17 @@
 Name:             python-cinderclient
-Version:          0.2.26
+Version:          1.0.1
 Release:          1%{?dist}
 Summary:          Python API and CLI for OpenStack cinder
 
 Group:            Development/Languages
 License:          ASL 2.0
 URL:              http://github.com/openstack/python-cinderclient
-Source0:          http://tarballs.openstack.org/%{name}/%{name}-%{version}.tar.gz
+Source0:          https://pypi.python.org/packages/source/p/%{name}/%{name}-%{version}.tar.gz
 
 #
-# patches_base=0.2
+# patches_base=1.0.1
 #
+Patch0001: 0001-Add-ability-to-call-force_delete-from-cinderclient.patch
 
 BuildArch:        noarch
 BuildRequires:    python-setuptools
@@ -27,6 +28,8 @@ cinderclient module), and a command-line script (cinder). Each implements
 %prep
 %setup -q
 
+%patch0001 -p1
+
 # TODO: Have the following handle multi line entries
 sed -i '/setup_requires/d; /install_requires/d; /dependency_links/d' setup.py
 
@@ -50,6 +53,10 @@ rm -fr %{buildroot}%{python_sitelib}/tests
 %{python_sitelib}/*.egg-info
 
 %changelog
+* Tue Mar 19 2013 Jakub Ruzicka <jruzicka at redhat.com> 1.0.1-1
+- Update to 1.0.1.
+- Use pypi tarball instead of tarballs.openstack.org.
+
 * Mon Sep 25 2012 Pádraig Brady <P at draigBrady.com> 0.2.26-1
 - Update to latest client to support latest cinder
 
diff --git a/sources b/sources
index 0d83246..ea5433d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c2f2af178ecce58f2618afe86d1b703c  python-cinderclient-0.2.26.tar.gz
+1e525b3e8979759115f568ac2abb431a  python-cinderclient-1.0.1.tar.gz