[openstack-nova] Updated patches from master-patches

[Alan Pevec]

commit 2af3328550421a9e540081cbd9e4907eee06ceaf
Author: Alan Pevec <alan.pevec at redhat.com>
Date:   Thu Aug 28 02:50:57 2014 +0200

    Updated patches from master-patches

 ...Move-notification-point-to-a-better-place.patch |   14 ++++------
 ...eclient.middleware-instead-of-keystonemid.patch |   26 --------------------
 openstack-nova.spec                                |   10 ++++---
 3 files changed, 12 insertions(+), 38 deletions(-)
---
diff --git a/0004-Move-notification-point-to-a-better-place.patch b/0004-Move-notification-point-to-a-better-place.patch
index fae0d1b..fa61a53 100644
--- a/0004-Move-notification-point-to-a-better-place.patch
+++ b/0004-Move-notification-point-to-a-better-place.patch
@@ -1,4 +1,4 @@
-From efc76b75a9d0077ee2cd55e43787962cdcc1c51d Mon Sep 17 00:00:00 2001
+From 3b952a77c61deaac7587742761cd7a7ed82184c7 Mon Sep 17 00:00:00 2001
 From: Alan Pevec <apevec at redhat.com>
 Date: Mon, 14 Apr 2014 18:11:04 +0200
 Subject: [PATCH] Move notification point to a better place
@@ -17,11 +17,11 @@ Launcher type.
 Change-Id: I69bf10f353f5fecaaf89e537c2d3c46b73e39d36
 Implements: blueprint service-readiness
 ---
- nova/openstack/common/service.py | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
+ nova/openstack/common/service.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/nova/openstack/common/service.py b/nova/openstack/common/service.py
-index 80e345b..c6ede15 100644
+index 80e345b..7c2dc1e 100644
 --- a/nova/openstack/common/service.py
 +++ b/nova/openstack/common/service.py
 @@ -190,6 +190,7 @@ class ServiceLauncher(Launcher):
@@ -32,16 +32,14 @@ index 80e345b..c6ede15 100644
          while True:
              self.handle_signal()
              status, signo = self._wait_for_exit_or_signal(ready_callback)
-@@ -382,7 +383,8 @@ class ProcessLauncher(object):
+@@ -382,6 +383,7 @@ class ProcessLauncher(object):
      def wait(self):
          """Loop waiting on children to die and respawning as necessary."""
  
--        LOG.debug('Full set of CONF:')
 +        systemd.notify_once()
-+        LOG.debug(_('Full set of CONF:'))
+         LOG.debug('Full set of CONF:')
          CONF.log_opt_values(LOG, std_logging.DEBUG)
  
-         try:
 @@ -488,7 +490,6 @@ class Services(object):
  
          """
diff --git a/openstack-nova.spec b/openstack-nova.spec
index ce10234..86c9692 100644
--- a/openstack-nova.spec
+++ b/openstack-nova.spec
@@ -3,7 +3,7 @@
 
 Name:             openstack-nova
 Version:          2014.2
-Release:          0.1.b2%{?dist}
+Release:          0.2.b2%{?dist}
 Summary:          OpenStack Compute (nova)
 
 Group:            Applications/System
@@ -43,7 +43,6 @@ Patch0001: 0001-Ensure-we-don-t-access-the-net-when-building-docs.patch
 Patch0002: 0002-remove-runtime-dep-on-python-pbr.patch
 Patch0003: 0003-Revert-Replace-oslo.sphinx-with-oslosphinx.patch
 Patch0004: 0004-Move-notification-point-to-a-better-place.patch
-Patch0005: 0005-Use-keystoneclient.middleware-instead-of-keystonemid.patch
 
 BuildArch:        noarch
 BuildRequires:    intltool
@@ -83,7 +82,7 @@ Summary:          Components common to all OpenStack Nova services
 Group:            Applications/System
 
 Requires:         python-nova = %{version}-%{release}
-Requires:         python-keystoneclient
+Requires:         python-keystonemiddleware
 Requires:         python-oslo-rootwrap
 Requires:         python-oslo-messaging >= 1.3.0-0.1.a4
 Requires:         python-oslo-i18n
@@ -407,7 +406,6 @@ This package contains documentation files for nova.
 %patch0002 -p1
 %patch0003 -p1
 %patch0004 -p1
-%patch0005 -p1
 
 find . \( -name .gitignore -o -name .placeholder \) -delete
 
@@ -740,6 +738,10 @@ exit 0
 %endif
 
 %changelog
+* Thu Aug 28 2014 Alan Pevec <apevec at redhat.com> 2014.2-0.2.b2
+- use keystonemiddleware
+- fix nova-api startup issue
+
 * Sun Aug 03 2014  Vladan Popovic <vpopovic at redhat.com> 2014.2-0.1.b2
 - Update to upstream 2014.2.b2
 - openstack-nova-compute should depend on libvirt-daemon-kvm, not libvirt - rhbz#996715