[openstack-keystone/el6-icehouse] Updated patches from master-patches

[Alan Pevec]

commit b2b02846b99bc339bd4fcf7d105ec3da7c23b1e4
Author: Alan Pevec <apevec at redhat.com>
Date:   Mon May 5 22:22:07 2014 +0200

    Updated patches from master-patches

 0001-remove-runtime-dep-on-python-pbr.patch        |    2 +-
 ...-parameter-values-with-keystone-dist.conf.patch |    4 ++-
 ...3-Refactor-service-readiness-notification.patch |   33 ++++++++++++++------
 openstack-keystone.spec                            |    6 ++--
 4 files changed, 30 insertions(+), 15 deletions(-)
---
diff --git a/0001-remove-runtime-dep-on-python-pbr.patch b/0001-remove-runtime-dep-on-python-pbr.patch
index e377f09..002d750 100644
--- a/0001-remove-runtime-dep-on-python-pbr.patch
+++ b/0001-remove-runtime-dep-on-python-pbr.patch
@@ -1,4 +1,4 @@
-From afeaa05ccbb1c427160ba55f6819c5f5d19e8955 Mon Sep 17 00:00:00 2001
+From 45dcde99375c88ce4e8231c748a3e4df377a0215 Mon Sep 17 00:00:00 2001
 From: Alan Pevec <apevec at redhat.com>
 Date: Mon, 9 Sep 2013 00:38:42 +0200
 Subject: [PATCH] remove runtime dep on python-pbr
diff --git a/0002-sync-parameter-values-with-keystone-dist.conf.patch b/0002-sync-parameter-values-with-keystone-dist.conf.patch
index 173ecdf..708504a 100644
--- a/0002-sync-parameter-values-with-keystone-dist.conf.patch
+++ b/0002-sync-parameter-values-with-keystone-dist.conf.patch
@@ -1,9 +1,11 @@
-From 3a1178ea75131708e80676de56e9705b9a556a31 Mon Sep 17 00:00:00 2001
+From 5b075da509d4f5c4ed5b2bb99215eab7a7b1e368 Mon Sep 17 00:00:00 2001
 From: Alan Pevec <apevec at 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 | 17 +++++++++--------
  1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/0003-refactor-service-readiness-notification.patch b/0003-Refactor-service-readiness-notification.patch
similarity index 90%
rename from 0003-refactor-service-readiness-notification.patch
rename to 0003-Refactor-service-readiness-notification.patch
index 439ea51..bfdf976 100644
--- a/0003-refactor-service-readiness-notification.patch
+++ b/0003-Refactor-service-readiness-notification.patch
@@ -1,35 +1,48 @@
-From 9d9601c972745cdfa4bb44ce45fceb2beb8c70df Mon Sep 17 00:00:00 2001
+From 96b9cce3d94271c2c23219ccada6f414e6578373 Mon Sep 17 00:00:00 2001
 From: Alan Pevec <apevec at redhat.com>
 Date: Sun, 9 Mar 2014 23:27:46 +0100
-Subject: [PATCH] refactor service readiness notification
+Subject: [PATCH] Refactor service readiness notification
 
+import and apply Oslo systemd module
 drop old keystone.common.systemd
 drop onready configuration parameter
-import and apply new oslo systemd module
+ - systemd notification is no-op when not running inside systemd
+
+Oslo commit 53e1214c092f09e3851b1a1b55289a93a72b09ec
+
+Conflicts:
+        bin/keystone-all
+        etc/keystone.conf.sample
+        keystone/common/config.py
+
+Change-Id: I80f325c9be9c171c2dc8d5526570bf64f0f87c78
+(cherry picked from commit c045ea108d7246ccddcc8c540b6057b2105bfd07)
 ---
- bin/keystone-all                     |  11 +---
+ bin/keystone-all                     |  13 +----
  etc/keystone.conf.sample             |   7 ---
  keystone/common/config.py            |   7 ---
  keystone/common/systemd.py           |  41 --------------
  keystone/openstack/common/systemd.py | 104 +++++++++++++++++++++++++++++++++++
  openstack-common.conf                |   1 +
- 6 files changed, 107 insertions(+), 64 deletions(-)
+ 6 files changed, 107 insertions(+), 66 deletions(-)
  delete mode 100644 keystone/common/systemd.py
  create mode 100644 keystone/openstack/common/systemd.py
 
 diff --git a/bin/keystone-all b/bin/keystone-all
-index 315f3c1..571b733 100755
+index 315f3c1..de83f57 100755
 --- a/bin/keystone-all
 +++ b/bin/keystone-all
-@@ -47,6 +47,7 @@ from keystone.common import utils
+@@ -46,8 +46,7 @@ from keystone.common import sql
+ from keystone.common import utils
  from keystone import config
  from keystone.openstack.common.gettextutils import _
- from keystone.openstack.common import importutils
+-from keystone.openstack.common import importutils
+-from keystone import service
 +from keystone.openstack.common import systemd
- from keystone import service
  
  
-@@ -82,15 +83,7 @@ def serve(*servers):
+ CONF = config.CONF
+@@ -82,15 +81,7 @@ def serve(*servers):
              raise
  
      # notify calling process we are ready to serve
diff --git a/openstack-keystone.spec b/openstack-keystone.spec
index c8e8583..80c0ad9 100644
--- a/openstack-keystone.spec
+++ b/openstack-keystone.spec
@@ -7,7 +7,7 @@
 
 Name:           openstack-keystone
 Version:        2014.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        OpenStack Identity Service
 
 License:        ASL 2.0
@@ -26,7 +26,7 @@ Source21:       daemon_notify.sh
 #
 Patch0001: 0001-remove-runtime-dep-on-python-pbr.patch
 Patch0002: 0002-sync-parameter-values-with-keystone-dist.conf.patch
-Patch0003: 0003-refactor-service-readiness-notification.patch
+Patch0003: 0003-Refactor-service-readiness-notification.patch
 
 BuildArch:      noarch
 
@@ -250,7 +250,7 @@ fi
 %endif
 
 %changelog
-* Mon May 05 2014 Alan Pevec <apevec at redhat.com> 2014.1-3
+* Mon May 05 2014 Alan Pevec <apevec at redhat.com> 2014.1-4
 - Drop parallel python packages in RDO el6
 
 * Thu Apr 17 2014 Alan Pevec <apevec at redhat.com> 2014.1-2