[openstack-keystone/el6-havana] updated to stable havana 2013.2.2 release
Alan Pevec
apevec at fedoraproject.org
Fri Feb 14 19:36:45 UTC 2014
commit a626a9a4cfb5fceb2ab90045d97f0595cc2486d5
Author: Alan Pevec <apevec at redhat.com>
Date: Fri Feb 14 17:56:59 2014 +0100
updated to stable havana 2013.2.2 release
.gitignore | 1 +
0001-remove-runtime-dep-on-python-pbr.patch | 2 +-
...-parameter-values-with-keystone-dist.conf.patch | 2 +-
...-parallel-install-versions-of-epel-packag.patch | 2 +-
0004-improve-systemd-onready-notification.patch | 47 ++++++++++++++------
openstack-keystone.spec | 11 +++--
sources | 2 +-
7 files changed, 45 insertions(+), 22 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e679e04..0cab197 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/keystone-2013.2.tar.gz
/keystone-2013.2.1.tar.gz
+/keystone-2013.2.2.tar.gz
diff --git a/0001-remove-runtime-dep-on-python-pbr.patch b/0001-remove-runtime-dep-on-python-pbr.patch
index a482862..1ee8d6a 100644
--- a/0001-remove-runtime-dep-on-python-pbr.patch
+++ b/0001-remove-runtime-dep-on-python-pbr.patch
@@ -1,4 +1,4 @@
-From 9648dbb4838bfa5b5a5544c7a53c1150d8d8d485 Mon Sep 17 00:00:00 2001
+From 7f91aa8d349b6bc1110d4389f457957542b69626 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 cb6724d..0cffe1f 100644
--- a/0002-sync-parameter-values-with-keystone-dist.conf.patch
+++ b/0002-sync-parameter-values-with-keystone-dist.conf.patch
@@ -1,4 +1,4 @@
-From 0b4605840ca1e1f1ffc96a24fffbf95daa7d02a5 Mon Sep 17 00:00:00 2001
+From 9683150aa625a0a01edb201f60665a5b60b2f609 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
diff --git a/0003-Use-updated-parallel-install-versions-of-epel-packag.patch b/0003-Use-updated-parallel-install-versions-of-epel-packag.patch
index fcad4e9..490cb7e 100644
--- a/0003-Use-updated-parallel-install-versions-of-epel-packag.patch
+++ b/0003-Use-updated-parallel-install-versions-of-epel-packag.patch
@@ -1,4 +1,4 @@
-From e053026a8c21b064d8fa8d4287f7626680bb7f45 Mon Sep 17 00:00:00 2001
+From 7a754d74084fc73221ccb6a634dcd85fa7c5883c Mon Sep 17 00:00:00 2001
From: Alan Pevec <apevec at redhat.com>
Date: Mon, 9 Sep 2013 18:58:47 +0200
Subject: [PATCH] Use updated parallel install versions of epel package
diff --git a/0004-improve-systemd-onready-notification.patch b/0004-improve-systemd-onready-notification.patch
index 388927c..b5f0280 100644
--- a/0004-improve-systemd-onready-notification.patch
+++ b/0004-improve-systemd-onready-notification.patch
@@ -1,4 +1,4 @@
-From 7c0bc415553c635ae4c0f0edeeca0ab76cd4f4d3 Mon Sep 17 00:00:00 2001
+From f35c4ac0d7fd87f92a350044277a061280e70e6a Mon Sep 17 00:00:00 2001
From: Alan Pevec <apevec at redhat.com>
Date: Wed, 8 Jan 2014 18:52:09 +0100
Subject: [PATCH] improve systemd onready notification
@@ -11,24 +11,33 @@ to ensure service readiness is sent only once.
* add onready() method to simulate systemd environment
For testing purposes and optional use with SysV initscripts.
-Related: rhbz#1036515
+Resolves: rhbz#1058291
-Change-Id: I837ca8fed04780224d4cadcb535728b1b1d2adc5
+Upstream-Oslo: https://review.openstack.org/72683
+Change-Id: I80f325c9be9c171c2dc8d5526570bf64f0f87c78
---
- keystone/common/systemd.py | 63 ++++++++++++++++++++++++++++++++++++++--------
- 1 file changed, 52 insertions(+), 11 deletions(-)
+ keystone/common/systemd.py | 77 +++++++++++++++++++++++++++++++++++++---------
+ 1 file changed, 63 insertions(+), 14 deletions(-)
diff --git a/keystone/common/systemd.py b/keystone/common/systemd.py
-index 52d7aff..33836ab 100644
+index 52d7aff..e35a1d6 100644
--- a/keystone/common/systemd.py
+++ b/keystone/common/systemd.py
-@@ -15,29 +15,70 @@
+@@ -1,6 +1,6 @@
+ # vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+-# Copyright 2012 Red Hat, Inc.
++# Copyright 2012-2014 Red Hat, Inc.
+ #
+ # Licensed under the Apache License, Version 2.0 (the "License"); you may
+ # not use this file except in compliance with the License. You may obtain
+@@ -15,29 +15,78 @@
# under the License.
"""
-Helper module for systemd start-up completion notification.
+-Used for "onready" configuration parameter in keystone.conf
+Helper module for systemd service readiness notification.
- Used for "onready" configuration parameter in keystone.conf
"""
import os
@@ -45,6 +54,7 @@ index 52d7aff..33836ab 100644
+ socket_name = '\0%s' % socket_name[1:]
+ return socket_name
+
++
+def _sd_notify(unset_env, msg):
+ notify_socket = os.getenv('NOTIFY_SOCKET')
+ if notify_socket:
@@ -53,20 +63,29 @@ index 52d7aff..33836ab 100644
- # abstract namespace socket
- sysd = '\0%s' % sysd[1:]
- sock.connect(sysd)
-+ sock.connect(_abstractify(notify_socket))
- sock.sendall(msg)
- sock.close()
--
-+ if unset_env:
-+ del os.environ['NOTIFY_SOCKET']
+- sock.sendall(msg)
+- sock.close()
++ try:
++ sock.connect(_abstractify(notify_socket))
++ sock.sendall(msg)
++ if unset_env:
++ del os.environ['NOTIFY_SOCKET']
++ except EnvironmentError:
++ # service notification is best effort
++ pass
++ finally:
++ sock.close()
+
def notify():
- _sd_notify('READY=1')
+ _sd_notify(False, 'READY=1')
+
++
+def notify_once():
+ _sd_notify(True, 'READY=1')
+
++
+def onready(notify_socket, timeout):
+ """Wait for systemd style notification on the socket.
+
diff --git a/openstack-keystone.spec b/openstack-keystone.spec
index 2355aeb..1c9c0d5 100644
--- a/openstack-keystone.spec
+++ b/openstack-keystone.spec
@@ -1,13 +1,13 @@
#
-# This is 2013.2.1 Havana stable release
+# This is 2013.2.2 Havana stable release
#
%global release_name havana
%global with_doc %{!?_without_doc:1}%{?_without_doc:0}
Name: openstack-keystone
-Version: 2013.2.1
-Release: 2%{?dist}
+Version: 2013.2.2
+Release: 1%{?dist}
Summary: OpenStack Identity Service
License: ASL 2.0
@@ -22,7 +22,7 @@ Source21: daemon_notify.sh
#
-# patches_base=2013.2.1
+# patches_base=2013.2.2
#
Patch0001: 0001-remove-runtime-dep-on-python-pbr.patch
Patch0002: 0002-sync-parameter-values-with-keystone-dist.conf.patch
@@ -253,6 +253,9 @@ fi
%endif
%changelog
+* Fri Feb 14 2014 Alan Pevec <apevec at redhat.com> 2013.2.2-1
+- updated to stable havana 2013.2.2 release
+
* Fri Jan 10 2014 Alan Pevec <apevec at redhat.com> 2013.2.1-2
- use service readiness notification in initscript rhbz#1036515
diff --git a/sources b/sources
index 3533a33..cff30dc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-37b1fa2feba7417f45a1248c0ff75c00 keystone-2013.2.1.tar.gz
+16ec7345796e0b951614812a88b39239 keystone-2013.2.2.tar.gz
More information about the scm-commits
mailing list