[openstack-keystone] fix int/str config mismatch

[Pádraig Brady]

commit 749003b269364d32b1bbc0889fff1b13593a16b0
Author: Pádraig Brady <P at draigBrady.com>
Date:   Wed Mar 20 14:26:35 2013 +0000

    fix int/str config mismatch
    
    Backport for for http://pad.lv/1137696

 ...orts-should-be-ints-in-config-bug-1137696.patch |   27 ++++++++++++++++++++
 openstack-keystone.spec                            |    7 ++++-
 2 files changed, 33 insertions(+), 1 deletions(-)
---
diff --git a/0001-ports-should-be-ints-in-config-bug-1137696.patch b/0001-ports-should-be-ints-in-config-bug-1137696.patch
new file mode 100644
index 0000000..6370efd
--- /dev/null
+++ b/0001-ports-should-be-ints-in-config-bug-1137696.patch
@@ -0,0 +1,27 @@
+From 230d499f6341027f4749461766ee9b9a9d75ce14 Mon Sep 17 00:00:00 2001
+From: Dolph Mathews <dolph.mathews at gmail.com>
+Date: Tue, 5 Mar 2013 16:07:06 -0600
+Subject: [PATCH] ports should be ints in config (bug 1137696)
+
+Change-Id: I26c0481f1f8987f310e3c3710be49d541418e3fd
+---
+ keystone/config.py |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/keystone/config.py b/keystone/config.py
+index 936926d..ce673be 100644
+--- a/keystone/config.py
++++ b/keystone/config.py
+@@ -179,9 +179,9 @@ register_cli_int('pydev-debug-port', default=None)
+ 
+ register_str('admin_token', default='ADMIN')
+ register_str('bind_host', default='0.0.0.0')
+-register_str('compute_port', default=8774)
+-register_str('admin_port', default=35357)
+-register_str('public_port', default=5000)
++register_int('compute_port', default=8774)
++register_int('admin_port', default=35357)
++register_int('public_port', default=5000)
+ register_str('public_endpoint', default='http://localhost:%(public_port)d/')
+ register_str('admin_endpoint', default='http://localhost:%(admin_port)d/')
+ register_str('onready')
diff --git a/openstack-keystone.spec b/openstack-keystone.spec
index b75bdca..837519b 100644
--- a/openstack-keystone.spec
+++ b/openstack-keystone.spec
@@ -9,7 +9,7 @@
 
 Name:           openstack-keystone
 Version:        2013.1
-Release:        0.7.%{release_letter}%{milestone}%{?dist}
+Release:        0.8.%{release_letter}%{milestone}%{?dist}
 Summary:        OpenStack Identity Service
 
 License:        ASL 2.0
@@ -24,6 +24,7 @@ Source5:        openstack-keystone-sample-data
 #
 # patches_base=2013.1.g3
 #
+Patch0001: 0001-ports-should-be-ints-in-config-bug-1137696.patch
 
 BuildArch:      noarch
 BuildRequires:  python2-devel
@@ -86,6 +87,7 @@ This package contains documentation for Keystone.
 %prep
 %setup -q -n keystone-%{version}.%{release_letter}%{milestone}
 
+%patch0001 -p1
 sed -i 's/2013.1.g3/2013.1/' PKG-INFO
 
 find . \( -name .gitignore -o -name .placeholder \) -delete
@@ -206,6 +208,9 @@ fi
 %endif
 
 %changelog
+* Wed Mar 20 2013 Pádraig Brady <pbrady at redhat.com> 2013.1-0.8.g3
+- fix a grizzly issue with int/str config mismatch
+
 * Mon Mar 11 2013 Alan Pevec <apevec at redhat.com> 2013.1-0.7.g3
 - openssl is required for PKI tokens rhbz#918757