[openstack-keystone] Updated patches from master-patches

[Alan Pevec]

commit b11c316224367bf19809efda99f5b6b035d49c4a
Author: Alan Pevec <apevec at redhat.com>
Date:   Mon Oct 7 23:32:27 2013 +0200

    Updated patches from master-patches

 ...-httpd-keystone.py-to-httpd-keystone.wsgi.patch |   23 ++++---------------
 openstack-keystone.spec                            |    4 +-
 2 files changed, 7 insertions(+), 20 deletions(-)
---
diff --git a/0004-rename-httpd-keystone.py-to-httpd-keystone.wsgi.patch b/0004-rename-httpd-keystone.py-to-httpd-keystone.wsgi.patch
index 44fc8ce..7f85a85 100644
--- a/0004-rename-httpd-keystone.py-to-httpd-keystone.wsgi.patch
+++ b/0004-rename-httpd-keystone.py-to-httpd-keystone.wsgi.patch
@@ -1,4 +1,4 @@
-From 902d3d6d4a846b0ff98e951c0a4abf434518f332 Mon Sep 17 00:00:00 2001
+From 9e12f30922d985b974d79f9bfc0ddb17aac4c16c Mon Sep 17 00:00:00 2001
 From: Alan Pevec <apevec at redhat.com>
 Date: Fri, 4 Oct 2013 17:04:00 +0200
 Subject: [PATCH] rename httpd/keystone.py to httpd/keystone.wsgi
@@ -9,18 +9,17 @@ This matches openstack-dashboard[1]
 [1] https://github.com/openstack/horizon/tree/master/openstack_dashboard/wsgi
 
 Change-Id: I1ba7f0e0f72d5c9fa1d06cec2b50551eb7f2e296
-(cherry picked from commit bfcb2943c1f6f3b65ca86909f97e4528dcccc67f)
+(cherry picked from commit b22932feaf137b24475e10efff64d899db3573e0)
 ---
  doc/source/apache-httpd.rst |  4 ++--
  httpd/keystone.py           | 52 ---------------------------------------------
  httpd/keystone.wsgi         | 52 +++++++++++++++++++++++++++++++++++++++++++++
- httpd/wsgi-keystone.conf    |  4 ++--
- 4 files changed, 56 insertions(+), 56 deletions(-)
+ 3 files changed, 54 insertions(+), 54 deletions(-)
  delete mode 100644 httpd/keystone.py
  create mode 100644 httpd/keystone.wsgi
 
 diff --git a/doc/source/apache-httpd.rst b/doc/source/apache-httpd.rst
-index f4b6cb5..dc282a5 100644
+index f4b6cb5..7821f66 100644
 --- a/doc/source/apache-httpd.rst
 +++ b/doc/source/apache-httpd.rst
 @@ -67,9 +67,9 @@ Copy the file httpd/wsgi-keystone.conf to the appropriate location for your apac
@@ -28,7 +27,7 @@ index f4b6cb5..dc282a5 100644
      /etc/httpd/conf.d/wsgi-keystone.conf
  
 -Create the directory ``/var/www/cgi-bin/keystone/``. You can either hardlink or softlink the files ``main`` and ``admin`` to the file ``keystone.py`` in this directory.  For a distribution appropriate place, it should probably be copied to::
-+Create the directory ``/var/www/cgi-bin/keystone/`` and copy the file ``httpd/keystone.wsgi`` into this directory.  For a distribution appropriate place, it should probably be copied to::
++Create the directory ``/var/www/cgi-bin/keystone/``. You can either hardlink or softlink the files ``main`` and ``admin`` to the file ``keystone.wsgi`` in this directory.  For a distribution appropriate place, it should probably be copied to::
  
 -    /usr/share/openstack/keystone/httpd/keystone.py
 +    /usr/share/keystone/keystone.wsgi
@@ -151,15 +150,3 @@ index 0000000..50ae07e
 +# http://pythonpaste.org/deploy/
 +application = deploy.loadapp('config:%s' % config.find_paste_config(),
 +                             name=name)
-diff --git a/httpd/wsgi-keystone.conf b/httpd/wsgi-keystone.conf
-index d542a87..1f16fcd 100644
---- a/httpd/wsgi-keystone.conf
-+++ b/httpd/wsgi-keystone.conf
-@@ -1,5 +1,5 @@
--WSGIScriptAlias /keystone/main  /var/www/cgi-bin/keystone/main
--WSGIScriptAlias /keystone/admin  /var/www/cgi-bin/keystone/admin
-+WSGIScriptAlias /keystone/main  /var/www/cgi-bin/keystone/keystone.wsgi
-+WSGIScriptAlias /keystone/admin  /var/www/cgi-bin/keystone/keystone.wsgi
- 
- <Location "/keystone">
-  NSSRequireSSL
diff --git a/openstack-keystone.spec b/openstack-keystone.spec
index 0db916f..a43b55a 100644
--- a/openstack-keystone.spec
+++ b/openstack-keystone.spec
@@ -8,7 +8,7 @@
 
 Name:           openstack-keystone
 Version:        2013.2
-Release:        0.13.%{milestone}%{?dist}
+Release:        0.14.%{milestone}%{?dist}
 Summary:        OpenStack Identity Service
 
 License:        ASL 2.0
@@ -223,7 +223,7 @@ fi
 %endif
 
 %changelog
-* Mon Oct 07 2013 Alan Pevec <apevec at redhat.com> - 2013.2-0.13.rc1
+* Mon Oct 07 2013 Alan Pevec <apevec at redhat.com> - 2013.2-0.14.rc1
 - rename HTTPD integration to keystone.wsgi
 
 * Wed Oct 02 2013 Adam Young <ayoung at redhat> - 2013.2-0.11.rc1