From dd6f4ee4b0de16407ed99acd3bd44cd4680377b0 Mon Sep 17 00:00:00 2001
From: Alan Pevec <apevec@redhat.com>
Date: Apr 11 2014 20:00:11 +0000
Subject: restore upstream default for rpc backend (rabbit)


---

diff --git a/0002-sync-parameter-values-with-keystone-dist.conf.patch b/0002-sync-parameter-values-with-keystone-dist.conf.patch
index de6510b..426c96d 100644
--- a/0002-sync-parameter-values-with-keystone-dist.conf.patch
+++ b/0002-sync-parameter-values-with-keystone-dist.conf.patch
@@ -1,35 +1,35 @@
-From dd6ab06fc8a4934d9b3009e10e313db8f7102443 Mon Sep 17 00:00:00 2001
+From 80f9f5488b4e97c970a984dacf23850a94a90d18 Mon Sep 17 00:00:00 2001
 From: Alan Pevec <apevec@redhat.com>
 Date: Mon, 9 Sep 2013 15:22:20 +0200
 Subject: [PATCH] sync parameter values with keystone-dist.conf
 
+and adjust descriptions to take dist.conf defaults into account (rhbz#923912)
+
+Change-Id: If36c384f86843a6506a494d79beca65639fb3480
 ---
- etc/keystone.conf.sample | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
+ etc/keystone.conf.sample | 15 ++++++++-------
+ 1 file changed, 8 insertions(+), 7 deletions(-)
 
 diff --git a/etc/keystone.conf.sample b/etc/keystone.conf.sample
-index c5f57bf..6d52633 100644
+index c5f57bf..d48d806 100644
 --- a/etc/keystone.conf.sample
 +++ b/etc/keystone.conf.sample
-@@ -305,7 +305,7 @@
- 
- # The messaging driver to use, defaults to rabbit. Other
- # drivers include qpid and zmq. (string value)
--#rpc_backend=rabbit
-+#rpc_backend=qpid
+@@ -439,10 +439,11 @@
+ # %(default)s (string value)
+ #log_date_format=%Y-%m-%d %H:%M:%S
  
- # The default exchange under which topics are scoped. May be
- # overridden by an exchange name specified in the
-@@ -442,7 +442,7 @@
- # (Optional) Name of log file to output to. If no default is
- # set, logging will go to stdout. (string value)
+-# (Optional) Name of log file to output to. If no default is
+-# set, logging will go to stdout. (string value)
++# (Optional) Name of log file to output to. (string value)
++# If not set here, logging will go to /var/log/keystone/keystone.log,
++# default from keystone-dist.conf.
  # Deprecated group/name - [DEFAULT]/logfile
 -#log_file=<None>
 +#log_file=/var/log/keystone/keystone.log
  
  # (Optional) The base directory used for relative --log-file
  # paths (string value)
-@@ -581,7 +581,7 @@
+@@ -581,7 +582,7 @@
  
  # Catalog template file name for use with the template catalog
  # backend. (string value)
@@ -38,7 +38,7 @@ index c5f57bf..6d52633 100644
  
  # Keystone catalog backend driver. (string value)
  #driver=keystone.catalog.backends.sql.Catalog
-@@ -622,7 +622,7 @@
+@@ -622,7 +623,7 @@
  # Deprecated group/name - [DEFAULT]/sql_connection
  # Deprecated group/name - [DATABASE]/sql_connection
  # Deprecated group/name - [sql]/connection
@@ -47,7 +47,7 @@ index c5f57bf..6d52633 100644
  
  # The SQL mode to be used for MySQL sessions. This option,
  # including the default, overrides any server-set SQL mode. To
-@@ -710,7 +710,7 @@
+@@ -710,7 +711,7 @@
  #
  
  # Keystone EC2Credential backend driver. (string value)
@@ -56,7 +56,7 @@ index c5f57bf..6d52633 100644
  
  
  [endpoint_filter]
-@@ -1147,7 +1147,7 @@
+@@ -1147,7 +1148,7 @@
  
  # Name of the paste configuration file that defines the
  # available pipelines. (string value)
diff --git a/0003-refactor-service-readiness-notification.patch b/0003-refactor-service-readiness-notification.patch
index 8e49f16..f9ac8d1 100644
--- a/0003-refactor-service-readiness-notification.patch
+++ b/0003-refactor-service-readiness-notification.patch
@@ -1,4 +1,4 @@
-From 10bd60ae3c5fd2a2fd1565da43c4e971a622072a Mon Sep 17 00:00:00 2001
+From 7bd28ac031ceab2e57c878782a29e0180ea1d9cf Mon Sep 17 00:00:00 2001
 From: Alan Pevec <apevec@redhat.com>
 Date: Sun, 9 Mar 2014 23:27:46 +0100
 Subject: [PATCH] refactor service readiness notification
@@ -48,7 +48,7 @@ index 315f3c1..c3a195d 100755
      for name, server in servers:
          server.wait()
 diff --git a/etc/keystone.conf.sample b/etc/keystone.conf.sample
-index 6d52633..d7f4359 100644
+index d48d806..bd44239 100644
 --- a/etc/keystone.conf.sample
 +++ b/etc/keystone.conf.sample
 @@ -56,13 +56,6 @@
diff --git a/keystone-dist.conf b/keystone-dist.conf
index 1d148b4..6a00201 100644
--- a/keystone-dist.conf
+++ b/keystone-dist.conf
@@ -1,6 +1,5 @@
 [DEFAULT]
 log_file=/var/log/keystone/keystone.log
-rpc_backend=qpid
 
 [database]
 connection=mysql://keystone:keystone@localhost/keystone
diff --git a/openstack-keystone.spec b/openstack-keystone.spec
index 7e2bfcf..fe141b8 100644
--- a/openstack-keystone.spec
+++ b/openstack-keystone.spec
@@ -8,7 +8,7 @@
 
 Name:           openstack-keystone
 Version:        2014.1
-Release:        0.8.%{milestone}%{?dist}
+Release:        0.9.%{milestone}%{?dist}
 Summary:        OpenStack Identity Service
 
 License:        ASL 2.0
@@ -226,6 +226,9 @@ fi
 %endif
 
 %changelog
+* Fri Apr 11 2014 Alan Pevec <apevec@redhat.com> 2014.1-0.9.rc2
+- icehouse rc2
+
 * Sun Mar 09 2014 Alan Pevec <apevec@redhat.com> 2014.1-0.5.b3
 - use oslo systemd module for service notification