From ac63379ae24e4a4cebab1afb435b39d252187d0a Mon Sep 17 00:00:00 2001 From: Alan Pevec Date: Sep 16 2015 23:21:27 +0000 Subject: Update to liberty-3 milestone Change-Id: Ib40bc3989e132a34eff7489578666e92d52ff8cd --- diff --git a/.gitignore b/.gitignore index a4e6e3e..eaab565 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /keystone-8.0.0.0b1.tar.gz /keystone-8.0.0.0b2.tar.gz +/keystone-8.0.0.0b3.tar.gz diff --git a/0001-sync-parameter-values-with-keystone-dist.conf.patch b/0001-sync-parameter-values-with-keystone-dist.conf.patch index 867ada3..01a6c6f 100644 --- a/0001-sync-parameter-values-with-keystone-dist.conf.patch +++ b/0001-sync-parameter-values-with-keystone-dist.conf.patch @@ -1,4 +1,4 @@ -From 59225f539cde18fff38a978a21cb15f9b87137f6 Mon Sep 17 00:00:00 2001 +From aec198ba7b09a7c15d7cd639db08eff76f2e11f5 Mon Sep 17 00:00:00 2001 From: Alan Pevec Date: Mon, 9 Sep 2013 15:22:20 +0200 Subject: [PATCH] sync parameter values with keystone-dist.conf @@ -11,10 +11,10 @@ Change-Id: If36c384f86843a6506a494d79beca65639fb3480 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/etc/keystone.conf.sample b/etc/keystone.conf.sample -index 776c759..c343b3d 100644 +index ec5a08c..99f89a6 100644 --- a/etc/keystone.conf.sample +++ b/etc/keystone.conf.sample -@@ -118,10 +118,11 @@ +@@ -122,10 +122,11 @@ # value) #log_date_format = %Y-%m-%d %H:%M:%S @@ -29,7 +29,7 @@ index 776c759..c343b3d 100644 # (Optional) The base directory used for relative --log-file paths. (string # value) -@@ -144,7 +145,7 @@ +@@ -148,7 +149,7 @@ #syslog_log_facility = LOG_USER # Log output to standard error. (boolean value) @@ -38,7 +38,7 @@ index 776c759..c343b3d 100644 # Format string to use for log messages with context. (string value) #logging_context_format_string = %(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s -@@ -375,7 +376,7 @@ +@@ -382,7 +383,7 @@ # Catalog template file name for use with the template catalog backend. (string # value) @@ -46,8 +46,8 @@ index 776c759..c343b3d 100644 +#template_file = /etc/keystone/default_catalog.templates # Entrypoint for the catalog backend driver in the keystone.catalog namespace. - # (string value) -@@ -484,7 +485,7 @@ + # Supplied drivers are kvs, sql, templated, and endpoint_filter.sql (string +@@ -492,7 +493,7 @@ # Deprecated group/name - [DEFAULT]/sql_connection # Deprecated group/name - [DATABASE]/sql_connection # Deprecated group/name - [sql]/connection @@ -56,7 +56,7 @@ index 776c759..c343b3d 100644 # The SQLAlchemy connection string to use to connect to the slave database. # (string value) -@@ -1637,7 +1638,7 @@ +@@ -1652,7 +1653,7 @@ # Name of the paste configuration file that defines the available pipelines. # (string value) diff --git a/openstack-keystone.spec b/openstack-keystone.spec index f83c319..6365553 100644 --- a/openstack-keystone.spec +++ b/openstack-keystone.spec @@ -1,7 +1,7 @@ %global with_doc %{!?_without_doc:1}%{?_without_doc:0} %global release_name liberty %global pypi_name keystone -%global milestone .0b2 +%global milestone .0b3 %{!?upstream_version: %global upstream_version %{version}%{?milestone}} @@ -10,11 +10,11 @@ Name: openstack-keystone # https://review.openstack.org/#/q/I6a35fa0dda798fad93b804d00a46af80f08d475c,n,z Epoch: 1 Version: 8.0.0 -Release: 0.2%{?milestone}%{?dist} +Release: 0.3%{?milestone}%{?dist} Summary: OpenStack Identity Service License: ASL 2.0 URL: http://keystone.openstack.org/ -Source0: http://launchpad.net/%{pypi_name}/%{release_name}/%{release_name}-2/+download/%{pypi_name}-%{upstream_version}.tar.gz +Source0: http://launchpad.net/%{pypi_name}/%{release_name}/%{release_name}-3/+download/%{pypi_name}-%{upstream_version}.tar.gz Source1: openstack-keystone.logrotate Source2: openstack-keystone.service @@ -22,18 +22,18 @@ Source3: openstack-keystone.sysctl Source5: openstack-keystone-sample-data Source20: keystone-dist.conf -# patches_base=8.0.0.0b2 +# patches_base=8.0.0.0b3 Patch0001: 0001-sync-parameter-values-with-keystone-dist.conf.patch BuildArch: noarch BuildRequires: python2-devel BuildRequires: python-pbr # Required to build keystone.conf -BuildRequires: python-oslo-config >= 2:1.11.0 +BuildRequires: python-oslo-config >= 2:2.3.0 BuildRequires: python-pycadf >= 0.8.0 Requires: python-keystone = %{epoch}:%{version}-%{release} -Requires: python-keystoneclient >= 1:1.1.0 +Requires: python-keystoneclient >= 1:1.6.0 Requires(post): systemd Requires(preun): systemd @@ -55,12 +55,12 @@ Requires: python-eventlet Requires: python-ldap Requires: python-ldappool Requires: python-memcached -Requires: python-migrate >= 0.9.5 +Requires: python-migrate >= 0.9.6 Requires: python-paste-deploy >= 1.5.0 Requires: python-routes >= 1.12 Requires: python-sqlalchemy >= 0.9.7 Requires: python-webob >= 1.2.3 -Requires: python-passlib +Requires: python-passlib >= 1.6 Requires: MySQL-python Requires: PyPAM Requires: python-iso8601 @@ -69,21 +69,21 @@ Requires: python-netaddr Requires: python-six >= 1.9.0 Requires: python-babel Requires: python-oauthlib -Requires: python-dogpile-cache >= 0.5.3 +Requires: python-dogpile-cache >= 0.5.4 Requires: python-jsonschema Requires: python-pycadf >= 0.8.0 Requires: python-posix_ipc -Requires: python-keystonemiddleware +Requires: python-keystonemiddleware >= 2.0.0 Requires: python-oslo-concurrency >= 2.3.0 -Requires: python-oslo-config >= 2:1.11.0 -Requires: python-oslo-db >= 1.12.0 +Requires: python-oslo-config >= 2:2.3.0 +Requires: python-oslo-db >= 2.4.1 Requires: python-oslo-i18n >= 1.5.0 -Requires: python-oslo-log >= 1.6.0 -Requires: python-oslo-messaging >= 1.16.0 -Requires: python-oslo-middleware >= 2.4.0 +Requires: python-oslo-log >= 1.8.0 +Requires: python-oslo-messaging >= 2.5.0 +Requires: python-oslo-middleware >= 2.8.0 Requires: python-oslo-policy >= 0.5.0 Requires: python-oslo-serialization >= 1.4.0 -Requires: python-oslo-utils >= 1.9.0 +Requires: python-oslo-utils >= 2.0.0 Requires: python-pysaml2 # for Keystone Lightweight Tokens (KLWT) Requires: python-cryptography @@ -103,19 +103,19 @@ BuildRequires: python-sphinx >= 1.1.2 BuildRequires: python-oslo-sphinx >= 2.5.0 # for API autodoc BuildRequires: python-cryptography -BuildRequires: python-dogpile-cache +BuildRequires: python-dogpile-cache >= 0.5.4 BuildRequires: python-jsonschema -BuildRequires: python-keystonemiddleware +BuildRequires: python-keystonemiddleware >= 2.0.0 BuildRequires: python-ldappool BuildRequires: python-memcached BuildRequires: python-oauthlib BuildRequires: python-oslo-concurrency >= 2.3.0 -BuildRequires: python-oslo-db >= 1.12.0 -BuildRequires: python-oslo-log >= 1.6.0 -BuildRequires: python-oslo-messaging >= 1.8.0 -BuildRequires: python-oslo-middleware >= 2.4.0 +BuildRequires: python-oslo-db >= 2.4.1 +BuildRequires: python-oslo-log >= 1.8.0 +BuildRequires: python-oslo-messaging >= 2.5.0 +BuildRequires: python-oslo-middleware >= 2.8.0 BuildRequires: python-oslo-policy >= 0.5.0 -BuildRequires: python-passlib +BuildRequires: python-passlib >= 1.6 BuildRequires: python-paste-deploy BuildRequires: python-pysaml2 BuildRequires: python-routes @@ -137,6 +137,9 @@ find keystone -name \*.py -exec sed -i '/\/usr\/bin\/env python/d' {} \; # Let RPM handle the dependencies rm -f test-requirements.txt requirements.txt +# adjust paths to WSGI scripts +sed -i 's#/local/bin#/bin#' httpd/wsgi-keystone.conf + %build PYTHONPATH=. oslo-config-generator --config-file=config-generator/keystone.conf # distribution defaults are located in keystone-dist.conf @@ -193,6 +196,7 @@ exit 0 %post %systemd_post openstack-keystone.service +%sysctl_apply openstack-keystone.conf %preun %systemd_preun openstack-keystone.service @@ -205,6 +209,8 @@ exit 0 %doc README.rst %{_mandir}/man1/keystone*.1.gz %{_bindir}/keystone-all +%{_bindir}/keystone-wsgi-admin +%{_bindir}/keystone-wsgi-public %{_bindir}/keystone-manage %{_bindir}/openstack-keystone-sample-data %dir %{_datadir}/keystone @@ -240,6 +246,9 @@ exit 0 %endif %changelog +* Thu Sep 17 2015 Alan Pevec 1:8.0.0-0.4.0b2 +- Update to upstream 8.0.0.0b3 + * Tue Aug 04 2015 Alan Pevec 1:8.0.0-0.2.0b2 - Update to upstream 8.0.0.0b2 diff --git a/sources b/sources index 9ed865e..a95ab1c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e60ff93efc0ce5a97d37b82ec8277f45 keystone-8.0.0.0b2.tar.gz +a00b5120272097145bbaa911624aae07 keystone-8.0.0.0b3.tar.gz