[openstack-keystone/el6-havana: 13/13] Merge branch 'f20' into el6-havana
Alan Pevec
apevec at fedoraproject.org
Tue Oct 8 00:09:48 UTC 2013
commit 061406e714acd51fae7a8d4b49d674f94b3b4a45
Merge: 030a800 b11c316
Author: Alan Pevec <apevec at redhat.com>
Date: Tue Oct 8 01:57:04 2013 +0200
Merge branch 'f20' into el6-havana
.gitignore | 1 +
0001-remove-runtime-dep-on-python-pbr.patch | 4 +-
...oslo.sphinx-and-remove-local-copy-of-doc-.patch | 2 +-
...-parameter-values-with-keystone-dist.conf.patch | 12 +-
...-httpd-keystone.py-to-httpd-keystone.wsgi.patch | 152 ++++++++++++++++++++
...-parallel-install-versions-of-epel-packag.patch | 2 +-
openstack-keystone.spec | 44 ++++--
sources | 2 +-
8 files changed, 192 insertions(+), 27 deletions(-)
---
diff --cc 0001-remove-runtime-dep-on-python-pbr.patch
index 43a23a5,4bdcf1e..c06669c
--- a/0001-remove-runtime-dep-on-python-pbr.patch
+++ b/0001-remove-runtime-dep-on-python-pbr.patch
@@@ -1,4 -1,4 +1,4 @@@
- From f30c64ddccf7eeeec2bc70b001a2bf30a2085630 Mon Sep 17 00:00:00 2001
-From 78a1117b3535bb5ad5d8d1bfce96f6adfc1d1794 Mon Sep 17 00:00:00 2001
++From c72a9700547a22f7b909ab5bfc3385adde3d59fa 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 --cc 0002-Revert-Use-oslo.sphinx-and-remove-local-copy-of-doc-.patch
index 48ab147,0fbd09a..9ea3156
--- a/0002-Revert-Use-oslo.sphinx-and-remove-local-copy-of-doc-.patch
+++ b/0002-Revert-Use-oslo.sphinx-and-remove-local-copy-of-doc-.patch
@@@ -1,4 -1,4 +1,4 @@@
- From d7a1a420891bddbbc35560f48d5619cc81e2ded5 Mon Sep 17 00:00:00 2001
-From 32787415e9e7bc8c0607b7077622563915e07aab Mon Sep 17 00:00:00 2001
++From 975979d8bbb2c65eded225b2db710f44cc907fe8 Mon Sep 17 00:00:00 2001
From: Alan Pevec <apevec at redhat.com>
Date: Mon, 9 Sep 2013 00:51:04 +0200
Subject: [PATCH] Revert "Use oslo.sphinx and remove local copy of doc theme"
diff --cc 0003-sync-parameter-values-with-keystone-dist.conf.patch
index d8a9764,f0431af..888c77e
--- a/0003-sync-parameter-values-with-keystone-dist.conf.patch
+++ b/0003-sync-parameter-values-with-keystone-dist.conf.patch
@@@ -1,4 -1,4 +1,4 @@@
- From 7968a7a6c23e5e0b56eca4e0e8bb548356a68ecc Mon Sep 17 00:00:00 2001
-From a24767d38c6780f78e250004db8223195c819c5e Mon Sep 17 00:00:00 2001
++From 99f1e1f6bfd791f4ed922cbd97980994135f5076 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 --cc 0004-rename-httpd-keystone.py-to-httpd-keystone.wsgi.patch
index 0000000,7f85a85..da203a7
mode 000000,100644..100644
--- a/0004-rename-httpd-keystone.py-to-httpd-keystone.wsgi.patch
+++ b/0004-rename-httpd-keystone.py-to-httpd-keystone.wsgi.patch
@@@ -1,0 -1,152 +1,152 @@@
-From 9e12f30922d985b974d79f9bfc0ddb17aac4c16c Mon Sep 17 00:00:00 2001
++From ae4adbccb0936c70052d1993e1f7837b567e56f9 Mon Sep 17 00:00:00 2001
+ From: Alan Pevec <apevec at redhat.com>
+ Date: Fri, 4 Oct 2013 17:04:00 +0200
+ Subject: [PATCH] rename httpd/keystone.py to httpd/keystone.wsgi
+
+ This matches openstack-dashboard[1]
+ .py is misleading since this isn't usable outside mod_wsgi
+
+ [1] https://github.com/openstack/horizon/tree/master/openstack_dashboard/wsgi
+
+ Change-Id: I1ba7f0e0f72d5c9fa1d06cec2b50551eb7f2e296
+ (cherry picked from commit b22932feaf137b24475e10efff64d899db3573e0)
+ ---
+ doc/source/apache-httpd.rst | 4 ++--
+ httpd/keystone.py | 52 ---------------------------------------------
+ httpd/keystone.wsgi | 52 +++++++++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 54 insertions(+), 54 deletions(-)
+ delete mode 100644 httpd/keystone.py
+ create mode 100644 httpd/keystone.wsgi
+
+ diff --git a/doc/source/apache-httpd.rst b/doc/source/apache-httpd.rst
+ index f4b6cb5..7821f66 100644
+ --- a/doc/source/apache-httpd.rst
+ +++ b/doc/source/apache-httpd.rst
+ @@ -67,9 +67,9 @@ Copy the file httpd/wsgi-keystone.conf to the appropriate location for your apac
+
+ /etc/httpd/conf.d/wsgi-keystone.conf
+
+ -Create the directory ``/var/www/cgi-bin/keystone/``. You can either hardlink or softlink the files ``main`` and ``admin`` to the file ``keystone.py`` in this directory. For a distribution appropriate place, it should probably be copied to::
+ +Create the directory ``/var/www/cgi-bin/keystone/``. You can either hardlink or softlink the files ``main`` and ``admin`` to the file ``keystone.wsgi`` in this directory. For a distribution appropriate place, it should probably be copied to::
+
+ - /usr/share/openstack/keystone/httpd/keystone.py
+ + /usr/share/keystone/keystone.wsgi
+
+ Keystone's primary configuration file (``etc/keystone.conf``) and the PasteDeploy
+ configuration file (``etc/keystone-paste.ini``) must be readable to HTTPD in
+ diff --git a/httpd/keystone.py b/httpd/keystone.py
+ deleted file mode 100644
+ index 50ae07e..0000000
+ --- a/httpd/keystone.py
+ +++ /dev/null
+ @@ -1,52 +0,0 @@
+ -# vim: tabstop=4 shiftwidth=4 softtabstop=4
+ -
+ -# Copyright 2013 OpenStack Foundation
+ -#
+ -# 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
+ -# a copy of the License at
+ -#
+ -# http://www.apache.org/licenses/LICENSE-2.0
+ -#
+ -# Unless required by applicable law or agreed to in writing, software
+ -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ -# License for the specific language governing permissions and limitations
+ -# under the License.
+ -
+ -import logging
+ -import os
+ -
+ -from paste import deploy
+ -
+ -from keystone.openstack.common import gettextutils
+ -
+ -# NOTE(blk-u):
+ -# gettextutils.install() must run to set _ before importing any modules that
+ -# contain static translated strings.
+ -#
+ -# Configure gettextutils for deferred translation of messages
+ -# so that error messages in responses can be translated according to the
+ -# Accept-Language in the request rather than the Keystone server locale.
+ -gettextutils.install('keystone', lazy=True)
+ -
+ -from keystone.common import environment
+ -from keystone import config
+ -from keystone.openstack.common import log
+ -
+ -
+ -CONF = config.CONF
+ -CONF(project='keystone')
+ -config.setup_logging(CONF)
+ -
+ -environment.use_stdlib()
+ -name = os.path.basename(__file__)
+ -
+ -if CONF.debug:
+ - CONF.log_opt_values(log.getLogger(CONF.prog), logging.DEBUG)
+ -
+ -# NOTE(ldbragst): 'application' is required in this context by WSGI spec.
+ -# The following is a reference to Python Paste Deploy documentation
+ -# http://pythonpaste.org/deploy/
+ -application = deploy.loadapp('config:%s' % config.find_paste_config(),
+ - name=name)
+ diff --git a/httpd/keystone.wsgi b/httpd/keystone.wsgi
+ new file mode 100644
+ index 0000000..50ae07e
+ --- /dev/null
+ +++ b/httpd/keystone.wsgi
+ @@ -0,0 +1,52 @@
+ +# vim: tabstop=4 shiftwidth=4 softtabstop=4
+ +
+ +# Copyright 2013 OpenStack Foundation
+ +#
+ +# 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
+ +# a copy of the License at
+ +#
+ +# http://www.apache.org/licenses/LICENSE-2.0
+ +#
+ +# Unless required by applicable law or agreed to in writing, software
+ +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ +# License for the specific language governing permissions and limitations
+ +# under the License.
+ +
+ +import logging
+ +import os
+ +
+ +from paste import deploy
+ +
+ +from keystone.openstack.common import gettextutils
+ +
+ +# NOTE(blk-u):
+ +# gettextutils.install() must run to set _ before importing any modules that
+ +# contain static translated strings.
+ +#
+ +# Configure gettextutils for deferred translation of messages
+ +# so that error messages in responses can be translated according to the
+ +# Accept-Language in the request rather than the Keystone server locale.
+ +gettextutils.install('keystone', lazy=True)
+ +
+ +from keystone.common import environment
+ +from keystone import config
+ +from keystone.openstack.common import log
+ +
+ +
+ +CONF = config.CONF
+ +CONF(project='keystone')
+ +config.setup_logging(CONF)
+ +
+ +environment.use_stdlib()
+ +name = os.path.basename(__file__)
+ +
+ +if CONF.debug:
+ + CONF.log_opt_values(log.getLogger(CONF.prog), logging.DEBUG)
+ +
+ +# NOTE(ldbragst): 'application' is required in this context by WSGI spec.
+ +# The following is a reference to Python Paste Deploy documentation
+ +# http://pythonpaste.org/deploy/
+ +application = deploy.loadapp('config:%s' % config.find_paste_config(),
+ + name=name)
diff --cc 0005-Use-updated-parallel-install-versions-of-epel-packag.patch
index 60ea179,0000000..144a7f6
mode 100644,000000..100644
--- a/0005-Use-updated-parallel-install-versions-of-epel-packag.patch
+++ b/0005-Use-updated-parallel-install-versions-of-epel-packag.patch
@@@ -1,64 -1,0 +1,64 @@@
- From 87fdcc5f0e53b6dcdcfc8dc0b10a3ebe662c9c35 Mon Sep 17 00:00:00 2001
++From d74f55101e1db3577032bbd722e7891b6533b931 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
+
+Use SQLAlchemy >= 0.7.8 WebOb >= 1.2 Routes >= 1.12.3 PasteDeploy >= 1.5.0
+and depend on the parallel installable
+versions of these packages to satisfy those requirements.
+---
+ bin/keystone-all | 4 ++--
+ keystone/__init__.py | 29 +++++++++++++++++++++++++++++
+ 2 files changed, 31 insertions(+), 2 deletions(-)
+
+diff --git a/bin/keystone-all b/bin/keystone-all
+index 02294d2..8f1fe89 100755
+--- a/bin/keystone-all
++++ b/bin/keystone-all
+@@ -31,10 +31,10 @@ if os.path.exists(os.path.join(possible_topdir,
+ sys.path.insert(0, possible_topdir)
+
+
+-from paste import deploy
+-
+ from keystone.openstack.common import gettextutils
+
++from paste import deploy
++
+ # NOTE(blk-u):
+ # gettextutils.install() must run to set _ before importing any modules that
+ # contain static translated strings.
+diff --git a/keystone/__init__.py b/keystone/__init__.py
+index e69de29..6af9f66 100644
+--- a/keystone/__init__.py
++++ b/keystone/__init__.py
+@@ -0,0 +1,29 @@
++import sys
++import pkg_resources
++
++# If there is a conflicting non egg module,
++# i.e. an older standard system module installed,
++# then replace it with this requirement
++def replace_dist(requirement):
++ try:
++ return pkg_resources.require(requirement)
++ except pkg_resources.VersionConflict:
++ e = sys.exc_info()[1]
++ dist=e.args[0]
++ req=e.args[1]
++ if dist.key == req.key and not dist.location.endswith('.egg'):
++ del pkg_resources.working_set.by_key[dist.key]
++ # We assume there is no need to adjust sys.path
++ # and the associated pkg_resources.working_set.entries
++ return pkg_resources.require(requirement)
++
++replace_dist("WebOb >= 1.2")
++replace_dist("SQLAlchemy >= 0.7.8")
++replace_dist("Routes >= 1.12.3")
++
++replace_dist("PasteDeploy >= 1.5.0")
++# This hack is needed because replace_dist() results in
++# the standard paste module path being at the start of __path__.
++# TODO: See can we get pkg_resources to do the right thing directly
++import paste
++paste.__path__.insert(0, paste.__path__.pop(-1))
diff --cc openstack-keystone.spec
index 44fa535,a43b55a..7c745af
--- a/openstack-keystone.spec
+++ b/openstack-keystone.spec
@@@ -14,10 -14,9 +14,10 @@@ Summary: OpenStack Identity Serv
License: ASL 2.0
URL: http://keystone.openstack.org/
#Source0: http://launchpad.net/keystone/%{release_name}/%{version}/+download/keystone-%{version}.tar.gz
- Source0: http://launchpad.net/keystone/%{release_name}/%{release_name}-%{milestone}/+download/keystone-%{version}.b%{milestone}.tar.gz
+ Source0: http://launchpad.net/keystone/%{release_name}/%{release_name}-%{milestone}/+download/keystone-%{version}.%{milestone}.tar.gz
Source1: openstack-keystone.logrotate
-Source2: openstack-keystone.service
+Source2: openstack-keystone.init
+Source3: openstack-keystone.upstart
Source5: openstack-keystone-sample-data
Source20: keystone-dist.conf
@@@ -28,19 -27,14 +28,20 @@@
Patch0001: 0001-remove-runtime-dep-on-python-pbr.patch
Patch0002: 0002-Revert-Use-oslo.sphinx-and-remove-local-copy-of-doc-.patch
Patch0003: 0003-sync-parameter-values-with-keystone-dist.conf.patch
- Patch0004: 0004-Use-updated-parallel-install-versions-of-epel-packag.patch
+ Patch0004: 0004-rename-httpd-keystone.py-to-httpd-keystone.wsgi.patch
++Patch0005: 0005-Use-updated-parallel-install-versions-of-epel-packag.patch
BuildArch: noarch
+
BuildRequires: python2-devel
-BuildRequires: python-sphinx >= 1.0
-BuildRequires: systemd-units
+BuildRequires: python-sphinx10
BuildRequires: python-pbr
BuildRequires: python-d2to1
+# These are required to build due to the requirements check added
+BuildRequires: python-sqlalchemy0.7
+BuildRequires: python-webob1.2
+BuildRequires: python-paste-deploy1.5
+BuildRequires: python-routes1.12
Requires: python-keystone = %{version}-%{release}
Requires: python-keystoneclient >= 1:0.3.0
@@@ -108,7 -100,7 +109,8 @@@ This package contains documentation fo
%patch0002 -p1
%patch0003 -p1
%patch0004 -p1
- sed -i 's/%{version}.b%{milestone}/%{version}/' PKG-INFO
++%patch0005 -p1
+ sed -i 's/%{version}.%{milestone}/%{version}/' PKG-INFO
find . \( -name .gitignore -o -name .placeholder \) -delete
find keystone -name \*.py -exec sed -i '/\/usr\/bin\/env python/d' {} \;
@@@ -141,11 -133,13 +143,14 @@@ install -p -D -m 640 etc/logging.conf.s
install -p -D -m 640 etc/default_catalog.templates %{buildroot}%{_sysconfdir}/keystone/default_catalog.templates
install -p -D -m 640 etc/policy.json %{buildroot}%{_sysconfdir}/keystone/policy.json
install -p -D -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/logrotate.d/openstack-keystone
-install -p -D -m 644 %{SOURCE2} %{buildroot}%{_unitdir}/openstack-keystone.service
+install -p -D -m 755 %{SOURCE2} %{buildroot}%{_initrddir}/openstack-keystone
# Install sample data script.
install -p -D -m 755 tools/sample_data.sh %{buildroot}%{_datadir}/keystone/sample_data.sh
+install -p -D -m 644 %{SOURCE3} %{buildroot}%{_datadir}/keystone/%{name}.upstart
install -p -D -m 755 %{SOURCE5} %{buildroot}%{_bindir}/openstack-keystone-sample-data
+ # Install sample HTTPD integration files
+ install -p -D -m 644 httpd/keystone.wsgi %{buildroot}%{_datadir}/keystone/
+ install -p -D -m 644 httpd/wsgi-keystone.conf %{buildroot}%{_datadir}/keystone/
install -d -m 755 %{buildroot}%{_sharedstatedir}/keystone
install -d -m 755 %{buildroot}%{_localstatedir}/log/keystone
@@@ -216,16 -196,17 +221,18 @@@ f
%{_bindir}/keystone-manage
%{_bindir}/openstack-keystone-sample-data
%dir %{_datadir}/keystone
- %attr(0640, root, keystone) %{_datadir}/keystone/keystone-dist.conf
- %attr(0640, root, keystone) %{_datadir}/keystone/keystone-dist-paste.ini
+ %attr(0644, root, keystone) %{_datadir}/keystone/keystone-dist.conf
+ %attr(0644, root, keystone) %{_datadir}/keystone/keystone-dist-paste.ini
%attr(0755, root, root) %{_datadir}/keystone/sample_data.sh
+%{_datadir}/keystone/%{name}.upstart
+%{_initrddir}/openstack-keystone
+ %attr(0644, root, keystone) %{_datadir}/keystone/keystone.wsgi
+ %attr(0644, root, keystone) %{_datadir}/keystone/wsgi-keystone.conf
-%{_unitdir}/openstack-keystone.service
%dir %attr(0750, root, keystone) %{_sysconfdir}/keystone
- %config(noreplace) %attr(-, root, keystone) %{_sysconfdir}/keystone/keystone.conf
- %config(noreplace) %attr(-, root, keystone) %{_sysconfdir}/keystone/logging.conf
- %config(noreplace) %attr(-, root, keystone) %{_sysconfdir}/keystone/default_catalog.templates
- %config(noreplace) %attr(-, keystone, keystone) %{_sysconfdir}/keystone/policy.json
+ %config(noreplace) %attr(0640, root, keystone) %{_sysconfdir}/keystone/keystone.conf
+ %config(noreplace) %attr(0640, root, keystone) %{_sysconfdir}/keystone/logging.conf
+ %config(noreplace) %attr(0640, root, keystone) %{_sysconfdir}/keystone/default_catalog.templates
+ %config(noreplace) %attr(0640, keystone, keystone) %{_sysconfdir}/keystone/policy.json
%config(noreplace) %{_sysconfdir}/logrotate.d/openstack-keystone
%dir %attr(-, keystone, keystone) %{_sharedstatedir}/keystone
%dir %attr(0750, keystone, keystone) %{_localstatedir}/log/keystone
@@@ -243,10 -223,16 +250,15 @@@
%endif
%changelog
+ * Mon Oct 07 2013 Alan Pevec <apevec at redhat.com> - 2013.2-0.14.rc1
+ - rename HTTPD integration to keystone.wsgi
-
-* Wed Oct 02 2013 Adam Young <ayoung at redhat> - 2013.2-0.11.rc1
+ - HTTPD integration files
-
-* Wed Oct 02 2013 Alan Pevec <apevec at redhat.com> - 2013.2-0.10.rc1
+ - Havana release candidate
+
-* Mon Sep 09 2013 Alan Pevec <apevec at redhat.com> - 2013.2-0.9.b3
+* Wed Sep 11 2013 Alan Pevec <apevec at redhat.com> - 2013.2-0.11.b3
+- require webob1.2 rhbz#1006768
+
+* Mon Sep 09 2013 Alan Pevec <apevec at redhat.com> - 2013.2-0.10.b3
- havana-3 milestone
- drop pbr run-time dependency
- set distribution defaults in keystone-dist.conf
More information about the scm-commits
mailing list