[openstack-savanna/el6] Monkey patch novaclient bug

[matt]

commit b140aafa0c00f25fe8e7e9e2f7334b5914769b9c
Author: Matthew Farrellee <matt at redhat.com>
Date:   Mon Oct 14 15:56:12 2013 -0400

    Monkey patch novaclient bug

 nova-keypairs-get.patch |   25 +++++++++++++++++++++++++
 openstack-savanna.spec  |    5 ++++-
 2 files changed, 29 insertions(+), 1 deletions(-)
---
diff --git a/nova-keypairs-get.patch b/nova-keypairs-get.patch
new file mode 100644
index 0000000..8de1429
--- /dev/null
+++ b/nova-keypairs-get.patch
@@ -0,0 +1,25 @@
+commit 3b972bf60959510df8cdc06c87253bcd96339476
+Author: Matthew Farrellee <matt at redhat.com>
+Date:   Mon Oct 14 15:24:14 2013 -0400
+
+    Unconditionally monkey patch nova.keypairs.get
+    
+    Change-Id: Icf511e15d392fa79aca44aa8bd84200aa990cdd9
+
+diff --git a/savanna/utils/openstack/nova.py b/savanna/utils/openstack/nova.py
+index 1792018..91bde49 100644
+--- a/savanna/utils/openstack/nova.py
++++ b/savanna/utils/openstack/nova.py
+@@ -33,8 +33,10 @@ def client():
+     nova.client.auth_token = ctx.token
+     nova.client.management_url = compute_url
+     nova.images = images.SavannaImageManager(nova)
+-    if not hasattr(nova.keypairs, 'get'):
+-        nova.keypairs = keypairs.SavannaKeypairManager(nova)
++    # unconditionally patch 'get' until 
++    #   https://bugs.launchpad.net/python-novaclient/+bug/1223934
++    # is fixed for our use case and all we support
++    nova.keypairs = keypairs.SavannaKeypairManager(nova)
+ 
+     return nova
+ 
diff --git a/openstack-savanna.spec b/openstack-savanna.spec
index c600072..7eb282f 100644
--- a/openstack-savanna.spec
+++ b/openstack-savanna.spec
@@ -8,6 +8,7 @@ URL:           https://launchpad.net/savanna
 Source0:       http://tarballs.openstack.org/savanna/savanna-%{version}%{?suf}.tar.gz
 Source1:       openstack-savanna-api.init
 Patch0:        sqlalchemy0.7-magic.patch
+Patch1:        nova-keypairs-get.patch
 BuildArch:     noarch
 
 BuildRequires: python-pbr
@@ -30,7 +31,8 @@ Requires: python-iso8601
 Requires: python-jsonschema >= 1.3.0
 #?kombu>=2.4.8?
 Requires: python-oslo-config >= 1.2.0
-Requires: python-paramiko >= 1.8.0
+#?paramiko>=1.8.0?
+Requires: python-paramiko
 Requires: python-pbr
 Requires: python-cinderclient >= 1.0.5
 Requires: python-keystoneclient >= 0.3.2
@@ -53,6 +55,7 @@ clusters on OpenStack.
 %prep
 %setup -q -n savanna-%{version}%{?suf}
 %patch0
+%patch1 -p1
 rm -rf savanna.egg-info
 rm -f {test-,}requirements.txt
 sed -i 's/0.5.21/0.5.19/' setup.py