[openstack-savanna/el6] Workaround novaclient bug and pick up MANIFEST.in changes

[matt]

commit edac88def99b72f7fd1c9b46577dceec816a45f8
Author: Matthew Farrellee <matt at redhat.com>
Date:   Wed Sep 18 12:58:59 2013 -0400

    Workaround novaclient bug and pick up MANIFEST.in changes

 .gitignore                  |    1 +
 bug1223934-workaround.patch |   12 ++++++++++++
 openstack-savanna.spec      |   10 ++++++++--
 sources                     |    2 +-
 4 files changed, 22 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9394858..14b9e98 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /savanna-0.2.tar.gz
 /savanna-0.3.a252.ga1714e0.tar.gz
+/savanna-0.3.a274.gabf778f.tar.gz
diff --git a/bug1223934-workaround.patch b/bug1223934-workaround.patch
new file mode 100644
index 0000000..4443fa7
--- /dev/null
+++ b/bug1223934-workaround.patch
@@ -0,0 +1,12 @@
+--- savanna/service/validations/clusters.py	2013-09-18 12:10:23.463935548 -0400
++++ savanna/service/validations/clusters.py-mf	2013-09-18 12:10:44.101063461 -0400
+@@ -50,7 +50,8 @@
+                                                      ct_id)
+ 
+     if data.get('user_keypair_id'):
+-        b.check_keypair_exists(data['user_keypair_id'])
++        #b.check_keypair_exists(data['user_keypair_id'])
++        pass
+ 
+     if data.get('default_image_id'):
+         b.check_image_registered(data['default_image_id'])
diff --git a/openstack-savanna.spec b/openstack-savanna.spec
index a42ad64..420dd2a 100644
--- a/openstack-savanna.spec
+++ b/openstack-savanna.spec
@@ -1,4 +1,4 @@
-%define master .a252.ga1714e0
+%define master .a274.gabf778f
 
 Name:          openstack-savanna
 Version:       0.3
@@ -12,6 +12,7 @@ Source0:       savanna-%{version}%{master}.tar.gz
 #Source0:       http://tarballs.openstack.org/savanna/savanna-%%{version}.tar.gz
 Source1:       openstack-savanna-api.init
 Patch0:        sqlalchemy0.7-magic.patch
+Patch1:        bug1223934-workaround.patch
 BuildArch:     noarch
 
 BuildRequires: python-pbr
@@ -54,6 +55,7 @@ clusters on OpenStack.
 %prep
 %setup -q -n savanna-%{version}%{?master}
 %patch0
+%patch1
 rm -rf savanna.egg-info
 rm -f {test-,}requirements.txt
 sed -i 's/0.5.21/0.5.19/' setup.py
@@ -147,10 +149,14 @@ fi
 
 
 %changelog
+* Wed Sep 18 2013 Matthew Farrellee <matt at redhat> - 0.3-0.1.a274.gabf778f
+- Add workaround patch for novaclient bug 1223934
+
 * Thu Sep 12 2013 Matthew Farrellee <matt at redhat> - 0.3-0.1.a252.ga1714e0
 - Update to build and run post pbr addition and pycrypto removal
-- Add magic patch to use SQLAlchemy0.7 on EL6
 - Add removal of sdist egg
+- Add magic patch to use SQLAlchemy0.7 on EL6
+- Add workaround patch for novaclient bug 1223934
 
 * Mon Aug 12 2013 Matthew Farrellee <matt at redhat> - 0.2-3
 - Updates to build on EL6,
diff --git a/sources b/sources
index 00fc10e..6de0daf 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-608e43fc56d4f7b207c6033c1f17f975  savanna-0.3.a252.ga1714e0.tar.gz
+f030a72d27b8fd44d0c8b30e172ac3d1  savanna-0.3.a274.gabf778f.tar.gz