apevec pushed to openstack-keystone (f20). "OpenStack Havana is EOL https://wiki.openstack.org/wiki/Releases (..more)"
notifications at fedoraproject.org
notifications at fedoraproject.org
Thu Apr 9 14:40:23 UTC 2015
>From 2fdfdd6c8eac32334c2a5018fef196b041468979 Mon Sep 17 00:00:00 2001
From: Alan Pevec <alan.pevec at redhat.com>
Date: Thu, 9 Apr 2015 16:40:09 +0200
Subject: OpenStack Havana is EOL https://wiki.openstack.org/wiki/Releases
Change-Id: I25e14115424ba1d8b145e8f15907ccdcc656e8d2
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 8cc1e18..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/keystone-2013.2.tar.gz
-/keystone-2013.2.1.tar.gz
-/keystone-2013.2.2.tar.gz
-/keystone-2013.2.3.tar.gz
-/keystone-2013.2.4.tar.gz
diff --git a/0001-remove-runtime-dep-on-python-pbr.patch b/0001-remove-runtime-dep-on-python-pbr.patch
deleted file mode 100644
index cb81336..0000000
--- a/0001-remove-runtime-dep-on-python-pbr.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From c49317f2600643f7dd2de7a9d2c93dacc8b61507 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
-
----
- bin/keystone-all | 3 +--
- keystone/cli.py | 3 +--
- 2 files changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/bin/keystone-all b/bin/keystone-all
-index beec3df..1e6aecb 100755
---- a/bin/keystone-all
-+++ b/bin/keystone-all
-@@ -32,7 +32,6 @@ if os.path.exists(os.path.join(possible_topdir,
-
-
- from paste import deploy
--import pbr.version
-
- from keystone.openstack.common import gettextutils
-
-@@ -95,7 +94,7 @@ if __name__ == '__main__':
- config_files = [dev_conf]
-
- CONF(project='keystone',
-- version=pbr.version.VersionInfo('keystone').version_string(),
-+ version='REDHATKEYSTONEVERSION',
- default_config_files=config_files)
-
- config.setup_logging(CONF, product_name='keystone')
-diff --git a/keystone/cli.py b/keystone/cli.py
-index af2c2dc..4fd99cf 100644
---- a/keystone/cli.py
-+++ b/keystone/cli.py
-@@ -21,7 +21,6 @@ import os
- from migrate import exceptions
-
- from oslo.config import cfg
--import pbr.version
-
- from keystone.common import openssl
- from keystone.common.sql import migration
-@@ -212,7 +211,7 @@ def main(argv=None, config_files=None):
- CONF.register_cli_opt(command_opt)
- CONF(args=argv[1:],
- project='keystone',
-- version=pbr.version.VersionInfo('keystone').version_string(),
-+ version='REDHATKEYSTONEVERSION',
- usage='%(prog)s [' + '|'.join([cmd.name for cmd in CMDS]) + ']',
- default_config_files=config_files)
- config.setup_logging(CONF)
diff --git a/0002-sync-parameter-values-with-keystone-dist.conf.patch b/0002-sync-parameter-values-with-keystone-dist.conf.patch
deleted file mode 100644
index a905b27..0000000
--- a/0002-sync-parameter-values-with-keystone-dist.conf.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 7f6fb16eb5069a6c613b7d4552694e472d1acbce 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
-
----
- etc/keystone.conf.sample | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/etc/keystone.conf.sample b/etc/keystone.conf.sample
-index c24f8ff..dfabb61 100644
---- a/etc/keystone.conf.sample
-+++ b/etc/keystone.conf.sample
-@@ -52,7 +52,7 @@
- # verbose = False
-
- # Name of log file to output to. If not set, logging will go to stdout.
--# log_file = keystone.log
-+# log_file = /var/log/keystone/keystone.log
-
- # The directory to keep log files in (will be prepended to --logfile)
- # log_dir = /var/log/keystone
-@@ -140,7 +140,7 @@
-
- [sql]
- # The SQLAlchemy connection string used to connect to the database
--# connection = sqlite:///keystone.db
-+# connection = mysql://keystone:keystone@localhost/keystone
-
- # the timeout before idle sql connections are reaped
- # idle_timeout = 200
-@@ -188,7 +188,7 @@
- # static, file-based backend (does *NOT* support any management commands)
- # driver = keystone.catalog.backends.templated.TemplatedCatalog
-
--# template_file = default_catalog.templates
-+# template_file = /etc/keystone/default_catalog.templates
-
- # (Deprecated) List of possible substitutions for use in
- # formatting endpoints. Use caution when modifying this list.
-@@ -278,7 +278,7 @@
- # driver = keystone.policy.backends.sql.Policy
-
- [ec2]
--# driver = keystone.contrib.ec2.backends.kvs.Ec2
-+# driver = keystone.contrib.ec2.backends.sql.Ec2
-
- [assignment]
- # driver =
-@@ -432,4 +432,4 @@ oauth1 = keystone.auth.plugins.oauth1.OAuth
-
- [paste_deploy]
- # Name of the paste configuration file that defines the available pipelines
--config_file = keystone-paste.ini
-+# config_file = /usr/share/keystone/keystone-dist-paste.ini
diff --git a/0003-Use-updated-parallel-install-versions-of-epel-packag.patch b/0003-Use-updated-parallel-install-versions-of-epel-packag.patch
deleted file mode 100644
index 0b3788f..0000000
--- a/0003-Use-updated-parallel-install-versions-of-epel-packag.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 3c83dc203d8e2f050091a6d05d7981706bfcb482 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 1e6aecb..b08ac0a 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 --git a/0004-improve-systemd-onready-notification.patch b/0004-improve-systemd-onready-notification.patch
deleted file mode 100644
index d5ad003..0000000
--- a/0004-improve-systemd-onready-notification.patch
+++ /dev/null
@@ -1,125 +0,0 @@
-From 1380b7c5c51ed5a57dfb1e81a5175ca2e7f54b9b 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
-
-* add unset_environment parameter
-New parameter unset_environment was added to sd_notify
-http://www.freedesktop.org/software/systemd/man/sd_notify.html
-to ensure service readiness is sent only once.
-
-* add onready() method to simulate systemd environment
-For testing purposes and optional use with SysV initscripts.
-
-Resolves: rhbz#1058291
-
-Upstream-Oslo: https://review.openstack.org/72683
-Change-Id: I80f325c9be9c171c2dc8d5526570bf64f0f87c78
----
- 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..e35a1d6 100644
---- a/keystone/common/systemd.py
-+++ b/keystone/common/systemd.py
-@@ -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.
- """
-
- import os
- import socket
-+import sys
-
-
--def _sd_notify(msg):
-- sysd = os.getenv('NOTIFY_SOCKET')
-- if sysd:
-+def _abstractify(socket_name):
-+ if socket_name.startswith('@'):
-+ # abstract namespace socket
-+ 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:
- sock = socket.socket(socket.AF_UNIX, socket.SOCK_DGRAM)
-- if sysd.startswith('@'):
-- # abstract namespace socket
-- sysd = '\0%s' % sysd[1:]
-- sock.connect(sysd)
-- 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.
-+
-+ :param notify_socket: local socket address
-+ :type notify_socket: string
-+ :param timeout: socket timeout
-+ :type timeout: float
-+ :returns: 0 service ready
-+ 1 service not ready
-+ 2 timeout occured
-+ """
-+ sock = socket.socket(socket.AF_UNIX, socket.SOCK_DGRAM)
-+ sock.settimeout(timeout)
-+ sock.bind(_abstractify(notify_socket))
-+ try:
-+ msg = sock.recv(512)
-+ except socket.timeout:
-+ return 2
-+ finally:
-+ sock.close()
-+ if 'READY=1' in msg:
-+ return 0
-+ else:
-+ return 1
-
-
- if __name__ == '__main__':
-- notify()
-+ # simple CLI for testing
-+ if len(sys.argv) == 1:
-+ notify()
-+ elif len(sys.argv) >= 2:
-+ timeout = float(sys.argv[1])
-+ notify_socket = os.getenv('NOTIFY_SOCKET')
-+ if notify_socket:
-+ retval = onready(notify_socket, timeout)
-+ sys.exit(retval)
diff --git a/daemon_notify.sh b/daemon_notify.sh
deleted file mode 100755
index 3c2fe33..0000000
--- a/daemon_notify.sh
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/bin/bash
-
-#
-# start process in the background and wait for its readiness notification
-# via systemd style NOTIFY_SOCKET
-#
-daemon_notify() {
- exec=$1
- pidfile=$2
- startuplog=$3
- timeout=$4
-
- # Requires:
- # uuidgen (util-linux)
- # sleep (coreutils)
- export NOTIFY_SOCKET='@/org/rdoproject/systemd/notify/'$(uuidgen)
- python -m keystone.common.systemd $timeout &
- pidnotify=$!
- $exec &>$startuplog &
- pid=$!
- while [ -d /proc/$pid -a -d /proc/$pidnotify ]
- do
- sleep 1
- done
- # pick up return codes from either process
- if [ ! -d /proc/$pid ]
- then
- wait $pid
- retval=$?
- else
- retval=-1
- fi
- if [ ! -d /proc/$pidnotify ]
- then
- wait $pidnotify
- retnotify=$?
- else
- retnotify=-1
- fi
- if [ $retnotify -eq 0 ]
- then
- # readiness notification received, all OK
- echo $pid > $pidfile
- return 0
- else
- # readiness not received
- if [ $retval -eq -1 ]
- then
- # process exists in unknown state
- return 1
- else
- # startup failed
- return $retval
- fi
- fi
-}
-
-daemon_notify "$@"
-exit $?
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..3c4b470
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+OpenStack Havana is EOL https://wiki.openstack.org/wiki/Releases
diff --git a/keystone-dist.conf b/keystone-dist.conf
deleted file mode 100644
index f362a9b..0000000
--- a/keystone-dist.conf
+++ /dev/null
@@ -1,30 +0,0 @@
-[DEFAULT]
-log_file = /var/log/keystone/keystone.log
-onready = keystone.common.systemd
-
-[sql]
-connection = mysql://keystone:keystone@localhost/keystone
-
-[identity]
-driver = keystone.identity.backends.sql.Identity
-
-[catalog]
-driver = keystone.catalog.backends.sql.Catalog
-template_file = /etc/keystone/default_catalog.templates
-
-[token]
-driver = keystone.token.backends.sql.Token
-
-[policy]
-
-[ec2]
-driver = keystone.contrib.ec2.backends.sql.Ec2
-
-[ssl]
-
-[signing]
-
-[ldap]
-
-[paste_deploy]
-config_file = /usr/share/keystone/keystone-dist-paste.ini
diff --git a/openstack-keystone-sample-data b/openstack-keystone-sample-data
deleted file mode 100755
index a0a3619..0000000
--- a/openstack-keystone-sample-data
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-/usr/share/keystone/sample_data.sh "$@"
diff --git a/openstack-keystone.init b/openstack-keystone.init
deleted file mode 100755
index 8329965..0000000
--- a/openstack-keystone.init
+++ /dev/null
@@ -1,98 +0,0 @@
-#!/bin/sh
-#
-# keystone OpenStack Identity Service
-#
-# chkconfig: - 98 02
-# description: keystone works provide apis to \
-# * Authenticate users and provide a token \
-# * Validate tokens
-### END INIT INFO
-
-. /etc/rc.d/init.d/functions
-
-prog=keystone
-exec="/usr/bin/$prog-all"
-config="/etc/$prog/$prog.conf"
-distconfig="/usr/share/$prog/$prog-dist.conf"
-pidfile="/var/run/$prog/$prog.pid"
-startuplog="/var/log/$prog/$prog-startup.log"
-timeout=60
-wrapper="/usr/share/$prog/daemon_notify.sh"
-
-[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
-
-lockfile=/var/lock/subsys/$prog
-
-start() {
- [ -x $exec ] || exit 5
- [ -f $config ] || exit 6
- echo -n $"Starting $prog: "
- daemon --user keystone --pidfile $pidfile "$wrapper $exec $pidfile $startuplog $timeout"
- retval=$?
- echo
- [ $retval -eq 0 ] && touch $lockfile
- return $retval
-}
-
-stop() {
- echo -n $"Stopping $prog: "
- killproc -p $pidfile $prog
- retval=$?
- echo
- [ $retval -eq 0 ] && rm -f $lockfile
- return $retval
-}
-
-restart() {
- stop
- start
-}
-
-reload() {
- restart
-}
-
-force_reload() {
- restart
-}
-
-rh_status() {
- status -p $pidfile $prog
-}
-
-rh_status_q() {
- rh_status >/dev/null 2>&1
-}
-
-
-case "$1" in
- start)
- rh_status_q && exit 0
- $1
- ;;
- stop)
- rh_status_q || exit 0
- $1
- ;;
- restart)
- $1
- ;;
- reload)
- rh_status_q || exit 7
- $1
- ;;
- force-reload)
- force_reload
- ;;
- status)
- rh_status
- ;;
- condrestart|try-restart)
- rh_status_q || exit 0
- restart
- ;;
- *)
- echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
- exit 2
-esac
-exit $?
diff --git a/openstack-keystone.logrotate b/openstack-keystone.logrotate
deleted file mode 100644
index 8956a5f..0000000
--- a/openstack-keystone.logrotate
+++ /dev/null
@@ -1,7 +0,0 @@
-/var/log/keystone/*.log {
- weekly
- rotate 4
- missingok
- compress
- minsize 100k
-}
diff --git a/openstack-keystone.service b/openstack-keystone.service
deleted file mode 100644
index 265379f..0000000
--- a/openstack-keystone.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=OpenStack Identity Service (code-named Keystone)
-After=syslog.target network.target
-
-[Service]
-Type=notify
-Restart=always
-User=keystone
-ExecStart=/usr/bin/keystone-all --config-file /usr/share/keystone/keystone-dist.conf --config-file /etc/keystone/keystone.conf
-
-[Install]
-WantedBy=multi-user.target
diff --git a/openstack-keystone.spec b/openstack-keystone.spec
deleted file mode 100644
index e348b5d..0000000
--- a/openstack-keystone.spec
+++ /dev/null
@@ -1,512 +0,0 @@
-%global release_name havana
-
-%global with_doc %{!?_without_doc:1}%{?_without_doc:0}
-
-Name: openstack-keystone
-Version: 2013.2.4
-Release: 1%{?dist}
-Summary: OpenStack Identity Service
-
-License: ASL 2.0
-URL: http://keystone.openstack.org/
-Source0: http://launchpad.net/keystone/%{release_name}/%{version}/+download/keystone-%{version}.tar.gz
-Source1: openstack-keystone.logrotate
-Source2: openstack-keystone.service
-Source3: openstack-keystone.sysctl
-Source5: openstack-keystone-sample-data
-Source20: keystone-dist.conf
-Source21: daemon_notify.sh
-Source22: openstack-keystone.init
-Source23: openstack-keystone.upstart
-
-Patch0001: 0001-remove-runtime-dep-on-python-pbr.patch
-Patch0002: 0002-sync-parameter-values-with-keystone-dist.conf.patch
-Patch0003: 0003-Use-updated-parallel-install-versions-of-epel-packag.patch
-Patch0004: 0004-improve-systemd-onready-notification.patch
-
-BuildArch: noarch
-
-BuildRequires: python2-devel
-BuildRequires: python-sphinx >= 1.1.2
-BuildRequires: python-oslo-sphinx
-BuildRequires: python-pbr
-BuildRequires: python-d2to1
-%if 0%{?rhel} == 6
-# 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
-%endif
-
-
-Requires: python-keystone = %{version}-%{release}
-Requires: python-keystoneclient >= 1:0.3.0
-
-%if 0%{?rhel} == 6
-Requires(post): chkconfig
-Requires(postun): initscripts
-Requires(preun): chkconfig
-Requires(preun): initscripts
-# for daemon_notify
-Requires: /usr/bin/uuidgen
-Requires: /bin/sleep
-%else
-Requires(post): systemd
-Requires(preun): systemd
-Requires(postun): systemd
-BuildRequires: systemd
-%endif
-Requires(pre): shadow-utils
-
-%description
-Keystone is a Python implementation of the OpenStack
-(http://www.openstack.org) identity service API.
-
-This package contains the Keystone daemon.
-
-%package -n python-keystone
-Summary: Keystone Python libraries
-Group: Applications/System
-
-Requires: python-eventlet
-Requires: python-ldap
-Requires: python-lxml
-Requires: python-memcached
-Requires: python-migrate
-%if 0%{?rhel} == 6
-Requires: python-paste-deploy1.5
-Requires: python-routes1.12
-Requires: python-sqlalchemy0.7
-Requires: python-webob1.2
-Requires: python-setuptools
-%else
-Requires: python-paste-deploy >= 1.5.0
-Requires: python-routes >= 1.12
-Requires: python-sqlalchemy >= 0.7.8
-Requires: python-webob >= 1.2.3
-%endif
-Requires: python-passlib
-Requires: MySQL-python
-Requires: PyPAM
-Requires: python-iso8601
-Requires: python-oslo-config >= 1:1.2.0
-Requires: openssl
-Requires: python-netaddr
-Requires: python-six
-Requires: python-babel >= 0.9.6
-Requires: python-oauth2
-Requires: python-dogpile-cache >= 0.5.0
-
-%description -n python-keystone
-Keystone is a Python implementation of the OpenStack
-(http://www.openstack.org) identity service API.
-
-This package contains the Keystone Python library.
-
-%if 0%{?with_doc}
-%package doc
-Summary: Documentation for OpenStack Identity Service
-Group: Documentation
-
-%description doc
-Keystone is a Python implementation of the OpenStack
-(http://www.openstack.org) identity service API.
-
-This package contains documentation for Keystone.
-%endif
-
-%prep
-%setup -q -n keystone-%{version}
-
-%patch0001 -p1
-%patch0002 -p1
-%patch0003 -p1
-%patch0004 -p1
-
-find . \( -name .gitignore -o -name .placeholder \) -delete
-find keystone -name \*.py -exec sed -i '/\/usr\/bin\/env python/d' {} \;
-# Remove bundled egg-info
-rm -rf keystone.egg-info
-# Let RPM handle the dependencies
-rm -f test-requirements.txt requirements.txt
-# Remove dependency on pbr and set version as per rpm
-sed -i s/REDHATKEYSTONEVERSION/%{version}/ bin/keystone-all keystone/cli.py
-
-
-%build
-cp etc/keystone.conf.sample etc/keystone.conf
-# distribution defaults are located in keystone-dist.conf
-
-%{__python} setup.py build
-
-%install
-%{__python} setup.py install --skip-build --root %{buildroot}
-
-# Delete tests
-rm -fr %{buildroot}%{python_sitelib}/tests
-rm -fr %{buildroot}%{python_sitelib}/run_tests.*
-
-install -d -m 755 %{buildroot}%{_sysconfdir}/keystone
-install -p -D -m 640 etc/keystone.conf %{buildroot}%{_sysconfdir}/keystone/keystone.conf
-install -p -D -m 644 etc/keystone-paste.ini %{buildroot}%{_datadir}/keystone/keystone-dist-paste.ini
-install -p -D -m 644 %{SOURCE20} %{buildroot}%{_datadir}/keystone/keystone-dist.conf
-install -p -D -m 640 etc/logging.conf.sample %{buildroot}%{_sysconfdir}/keystone/logging.conf
-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
-%if 0%{?rhel} == 6
-# Install service readiness wrapper
-install -p -D -m 755 %{SOURCE21} %{buildroot}%{_datadir}/keystone/daemon_notify.sh
-install -p -D -m 755 %{SOURCE22} %{buildroot}%{_initrddir}/openstack-keystone
-install -p -D -m 644 %{SOURCE23} %{buildroot}%{_datadir}/keystone/%{name}.upstart
-%else
-install -p -D -m 644 %{SOURCE2} %{buildroot}%{_unitdir}/openstack-keystone.service
-%endif
-install -d -m 755 %{buildroot}%{_prefix}/lib/sysctl.d
-install -p -D -m 644 %{SOURCE3} %{buildroot}%{_prefix}/lib/sysctl.d/openstack-keystone.conf
-# Install sample data script.
-install -p -D -m 755 tools/sample_data.sh %{buildroot}%{_datadir}/keystone/sample_data.sh
-install -p -D -m 755 %{SOURCE5} %{buildroot}%{_bindir}/openstack-keystone-sample-data
-# Install sample HTTPD integration files
-install -p -D -m 644 httpd/keystone.py %{buildroot}%{_datadir}/keystone/keystone.wsgi
-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
-%if 0%{?rhel} == 6
-install -d -m 755 %{buildroot}%{_localstatedir}/run/keystone
-%endif
-
-# docs generation requires everything to be installed first
-export PYTHONPATH="$( pwd ):$PYTHONPATH"
-pushd doc
-make html
-make man
-mkdir -p %{buildroot}%{_mandir}/man1
-install -p -D -m 644 build/man/*.1 %{buildroot}%{_mandir}/man1/
-popd
-# Fix hidden-file-or-dir warnings
-rm -fr doc/build/html/.doctrees doc/build/html/.buildinfo
-
-%pre
-# 163:163 for keystone (openstack-keystone) - rhbz#752842
-getent group keystone >/dev/null || groupadd -r --gid 163 keystone
-getent passwd keystone >/dev/null || \
-useradd --uid 163 -r -g keystone -d %{_sharedstatedir}/keystone -s /sbin/nologin \
--c "OpenStack Keystone Daemons" keystone
-exit 0
-
-%post
-%if 0%{?rhel} == 6
-if [ $1 -eq 1 ] ; then
- # Initial installation
- /sbin/chkconfig --add openstack-keystone
-fi
-%else
-%systemd_post openstack-keystone.service
-%endif
-
-%preun
-%if 0%{?rhel} == 6
-if [ $1 -eq 0 ] ; then
- # Package removal, not upgrade
- /sbin/service openstack-keystone stop >/dev/null 2>&1
- /sbin/chkconfig --del openstack-keystone
-fi
-%else
-%systemd_preun openstack-keystone.service
-%endif
-
-%postun
-%if 0%{?rhel} == 6
-if [ $1 -ge 1 ] ; then
- # Package upgrade, not uninstall
- /sbin/service openstack-keystone condrestart >/dev/null 2>&1 || :
-fi
-%else
-%systemd_postun_with_restart openstack-keystone.service
-%endif
-
-%files
-%doc LICENSE
-%doc README.rst
-%{_mandir}/man1/keystone*.1.gz
-%{_bindir}/keystone-all
-%{_bindir}/keystone-manage
-%{_bindir}/openstack-keystone-sample-data
-%dir %{_datadir}/keystone
-%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
-%attr(0644, root, keystone) %{_datadir}/keystone/keystone.wsgi
-%attr(0644, root, keystone) %{_datadir}/keystone/wsgi-keystone.conf
-%if 0%{?rhel} == 6
-%attr(0755, root, root) %{_datadir}/keystone/daemon_notify.sh
-%{_datadir}/keystone/%{name}.upstart
-%{_initrddir}/openstack-keystone
-%else
-%{_unitdir}/openstack-keystone.service
-%endif
-%dir %attr(0750, root, keystone) %{_sysconfdir}/keystone
-%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
-%if 0%{?rhel} == 6
-%dir %attr(-, keystone, keystone) %{_localstatedir}/run/keystone
-%endif
-%{_prefix}/lib/sysctl.d/openstack-keystone.conf
-
-
-%files -n python-keystone
-%defattr(-,root,root,-)
-%doc LICENSE
-%{python_sitelib}/keystone
-%{python_sitelib}/keystone-%{version}-*.egg-info
-
-%if 0%{?with_doc}
-%files doc
-%doc LICENSE doc/build/html
-%endif
-
-%changelog
-* Wed Sep 24 2014 Alan Pevec <alan.pevec at redhat.com> 2013.2.4-1
-- Update to upstream 2013.2.4
-- exclude default port 35357 from the ephemeral port range
-
-* Wed Jul 09 2014 Alan Pevec <apevec at redhat.com> 2013.2.3-5
-- Keystone V2 trusts privilege escalation through user supplied project id
- CVE-2014-3520
-
-* Fri Jun 13 2014 Alan Pevec <apevec at redhat.com> 2013.2.3-4
-- privilege escalation through trust chained delegation CVE-2014-3476
-
-* Mon Apr 21 2014 Alan Pevec <apevec at redhat.com> 2013.2.3-3
-- Sanitizes authentication methods received in requests CVE-2014-2828
-
-* Fri Apr 04 2014 Alan Pevec <apevec at redhat.com> 2013.2.3-2
-- updated to stable havana 2013.2.3 release
-- Trustee token revocation does not work with memcache backend CVE-2014-2237
-
-* Fri Feb 14 2014 Alan Pevec <apevec at redhat.com> 2013.2.2-1
-- updated to stable havana 2013.2.2 release
-
-* Tue Dec 17 2013 Alan Pevec <apevec at redhat.com> 2013.2.1-1
-- updated to stable havana 2013.2.1 release CVE-2013-6391
-
-* Wed Oct 30 2013 Alan Pevec <apevec at redhat.com> 2013.2-2
-- unintentional role granting with Keystone LDAP backend CVE-2013-4477
-
-* Thu Oct 17 2013 Alan Pevec <apevec at redhat.com> - 2013.2-1
-- Update to havana final
-
-* 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
-- havana-3 milestone
-- drop pbr run-time dependency
-- set distribution defaults in keystone-dist.conf
-
-* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2013.2-0.5.b2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Thu Jul 18 2013 pbrady at redhat.com 2013.2-0.4.b2
-- havana-2 milestone
-
-* Mon Jun 24 2013 apevec at redhat.com 2013.2-0.3.b1
-- restrict /var/log/keystone/ rhbz#956814
-
-* Sat Jun 22 2013 apevec at redhat.com 2013.2-0.2.b1
-- Force simple Bind for authentication CVE-2013-2157
-
-* Fri Jun 07 2013 Alan Pevec <apevec at redhat.com> 2013.2-0.1.h1
-- havana-1 milestone
-
-* Fri May 10 2013 Alan Pevec <apevec at redhat.com> 2013.1.1-1
-- updated to stable grizzly 2013.1.1 release CVE-2013-2006 CVE-2013-2059
-
-* Thu Apr 04 2013 Alan Pevec <apevec at redhat.com> 2013.1-1
-- Update to grizzly final
-
-* Wed Apr 03 2013 Alan Pevec <apevec at redhat.com> 2013.1-0.10.rc3
-- grizzly rc3
-
-* Fri Mar 29 2013 Alan Pevec <apevec at redhat.com> 2013.1-0.9.rc2
-- grizzly rc2
-
-* Wed Mar 20 2013 Pádraig Brady <pbrady at redhat.com> 2013.1-0.8.g3
-- fix a grizzly issue with int/str config mismatch
-
-* Mon Mar 11 2013 Alan Pevec <apevec at redhat.com> 2013.1-0.7.g3
-- openssl is required for PKI tokens rhbz#918757
-
-* Mon Mar 11 2013 Alan Pevec <apevec at redhat.com> 2013.1-0.6.g3
-- remove python-sqlalchemy restriction
-
-* Sun Feb 24 2013 Alan Pevec <apevec at redhat.com> 2013.1-0.5.g3
-- update dependencies
-
-* Sat Feb 23 2013 Alan Pevec <apevec at redhat.com> 2013.1-0.4.g3
-- grizzly-3 milestone
-
-* Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2013.1-0.3.g2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Fri Jan 11 2013 Alan Pevec <apevec at redhat.com> 2013.1-0.2.g2
-- grizzly-2 milestone
-
-* Thu Nov 22 2012 Alan Pevec <apevec at redhat.com> 2013.1-0.1.g1
-- grizzly-1 milestone
-
-* Fri Nov 16 2012 Alan Pevec <apevec at redhat.com> 2012.2-5
-- fix /etc/keystone directory permission CVE-2012-5483 (rhbz#873447)
-
-* Mon Nov 12 2012 Alan Pevec <apevec at redhat.com> 2012.2-4
-- readd iso8601 dependency (from openstack-common timeutils)
-
-* Fri Nov 09 2012 Alan Pevec <apevec at redhat.com> 2012.2-3
-- remove auth-token subpackage (rhbz#868357)
-
-* Thu Nov 08 2012 Alan Pevec <apevec at redhat.com> 2012.2-2
-- Fix default port for identity.internalURL in sample script
-
-* Thu Sep 27 2012 Alan Pevec <apevec at redhat.com> 2012.2-1
-- Update to folsom final
-
-* Wed Sep 26 2012 Alan Pevec <apevec at redhat.com> 2012.2-0.9.rc2
-- folsom rc2
-
-* Fri Sep 21 2012 Alan Pevec <apevec at redhat.com> 2012.2-0.8.rc1
-- fix systemd notification (rhbz#858188)
-
-* Fri Sep 14 2012 Alan Pevec <apevec at redhat.com> 2012.2-0.7.rc1
-- folsom rc1 (CVE-2012-4413)
-
-* Thu Aug 30 2012 Alan Pevec <apevec at redhat.com> 2012.2-0.6.f3
-- Require authz to update user's tenant (CVE-2012-3542)
-
-* Wed Aug 29 2012 Alan Pevec <apevec at redhat.com> 2012.2-0.5.f3
-- allow middleware configuration from app config
-
-* Mon Aug 20 2012 Alan Pevec <apevec at redhat.com> 2012.2-0.4.f3
-- folsom-3 milestone
-
-* Fri Jul 20 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2012.2-0.3.f2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Fri Jul 06 2012 Alan Pevec <apevec at redhat.com> 2012.2-0.2.f2
-- folsom-2 milestone (CVE-2012-3426)
-
-* Fri May 25 2012 Alan Pevec <apevec at redhat.com> 2012.2-0.1.f1
-- folsom-1 milestone
-
-* Thu May 24 2012 Alan Pevec <apevec at redhat.com> 2012.1-3
-- python-keystone-auth-token subpackage (rhbz#824034)
-- use reserved user id for keystone (rhbz#752842)
-
-* Mon May 21 2012 Alan Pevec <apevec at redhat.com> 2012.1-2
-- Sync up with Essex stable branch
-- Remove dependencies no loner needed by Essex
-
-* Thu Apr 05 2012 Alan Pevec <apevec at redhat.com> 2012.1-1
-- Essex release
-
-* Wed Apr 04 2012 Alan Pevec <apevec at redhat.com> 2012.1-0.13.rc2
-- essex rc2
-
-* Sat Mar 24 2012 Alan Pevec <apevec at redhat.com> 2012.1-0.12.rc1
-- update to final essex rc1
-
-* Wed Mar 21 2012 Alan Pevec <apevec at redhat.com> 2012.1-0.11.rc1
-- essex rc1
-
-* Thu Mar 08 2012 Alan Pevec <apevec at redhat.com> 2012.1-0.10.e4
-- change default catalog backend to sql rhbz#800704
-- update sample-data script
-- add missing keystoneclient dependency
-
-* Thu Mar 01 2012 Alan Pevec <apevec at redhat.com> 2012.1-0.9.e4
-- essex-4 milestone
-
-* Sat Feb 25 2012 Alan Pevec <apevec at redhat.com> 2012.1-0.8.e4
-- change default database to mysql
-
-* Tue Feb 21 2012 Alan Pevec <apevec at redhat.com> 2012.1-0.7.e4
-- switch all backends to sql
-
-* Mon Feb 20 2012 Alan Pevec <apevec at redhat.com> 2012.1-0.6.e4
-- add missing default_catalog.templates
-
-* Mon Feb 20 2012 Alan Pevec <apevec at redhat.com> 2012.1-0.5.e4
-- pre essex-4 snapshot, for keystone rebase
-
-* Mon Feb 13 2012 Alan Pevec <apevec at redhat.com> 2012.1-0.4.e3
-- fix deps rhbz#787072
-- keystone is not hashing passwords lp#924391
-- Fix "KeyError: 'service-header-mappings'" lp#925872
-
-* Wed Feb 8 2012 Toshio Kuratomi <toshio at fedoraproject.org> - 2012.1-0.3.e3
-- Remove the dep on python-sqlite2 as that's being retired in F17 and keystone
- will work with the sqlite3 module from the stdlib
-
-* Thu Jan 26 2012 Alan Pevec <apevec at redhat.com> 2012.1-0.2.e3
-- separate library to python-keystone
-- avoid conflict with python-keystoneclient
-
-* Thu Jan 26 2012 Alan Pevec <apevec at redhat.com> 2012.1-0.1.e3
-- essex-3 milestone
-
-* Wed Jan 18 2012 Alan Pevec <apevec at redhat.com> 2012.1-0.e2
-- essex-2 milestone
-
-* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2011.3.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Thu Nov 24 2011 Alan Pevec <apevec at redhat.com> 2011.3.1-2
-- include LICENSE, update package description from README.md
-
-* Mon Nov 21 2011 Alan Pevec <apevec at redhat.com> 2011.3.1-1
-- Update to 2011.3.1 stable/diablo release
-
-* Fri Nov 11 2011 Alan Pevec <apevec at redhat.com> 2011.3-2
-- Update to the latest stable/diablo snapshot
-
-* Mon Oct 24 2011 Mark McLoughlin <markmc at redhat.com> - 2011.3-1
-- Update version to diablo final
-
-* Wed Oct 19 2011 Matt Domsch <Matt_Domsch at dell.com> - 1.0-0.4.d4.1213
-- add Requires: python-passlib
-
-* Mon Oct 3 2011 Matt Domsch <Matt_Domsch at dell.com> - 1.0-0.2.d4.1213
-- update to diablo release.
-- BR systemd-units for _unitdir
-
-* Fri Sep 2 2011 Mark McLoughlin <markmc at redhat.com> - 1.0-0.2.d4.1078
-- Use upstream snapshot tarball
-- No need to define python_sitelib anymore
-- BR python2-devel
-- Remove BRs only needed for unit tests
-- No need to clean buildroot in install anymore
-- Use slightly more canonical site for URL tag
-- Prettify the requires tags
-- Cherry-pick tools.tracer patch from upstream
-- Add config file
-- Add keystone user and group
-- Ensure log file is in /var/log/keystone
-- Ensure the sqlite db is in /var/lib/keystone
-- Add logrotate support
-- Add system units
-
-* Thu Sep 1 2011 Matt Domsch <Matt_Domsch at dell.com> - 1.0-0.1.20110901git396f0bfd%{?dist}
-- initial packaging
diff --git a/openstack-keystone.sysctl b/openstack-keystone.sysctl
deleted file mode 100644
index 682c160..0000000
--- a/openstack-keystone.sysctl
+++ /dev/null
@@ -1,3 +0,0 @@
-# By default, keystone starts a service on IANA-assigned port 35357
-# http://www.iana.org/assignments/service-names-port-numbers/service-names-port-numbers.txt
-net.ipv4.ip_local_reserved_ports = 35357
diff --git a/openstack-keystone.upstart b/openstack-keystone.upstart
deleted file mode 100644
index 84e19ae..0000000
--- a/openstack-keystone.upstart
+++ /dev/null
@@ -1,12 +0,0 @@
-# Licensed under the Apache License, Version 2.0
-# http://bazaar.launchpad.net/~ubuntu-branches/ubuntu/quantal/keystone/quantal/view/head:/debian/copyright
-description "OpenStack Identity Service"
-author "Soren Hansen <soren at linux2go.dk>"
-# modified for RHEL6 by apevec at gmail.com
-
-start on stopped rc RUNLEVEL=[2345]
-stop on runlevel [S016]
-
-respawn
-
-exec su -s /bin/sh -c "exec keystone-all" keystone
diff --git a/sources b/sources
deleted file mode 100644
index 87f1ad8..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-99888e45f25ab25bdffd5586aac1e1f7 keystone-2013.2.4.tar.gz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/openstack-keystone.git/commit/?h=f20&id=2fdfdd6c8eac32334c2a5018fef196b041468979
More information about the scm-commits
mailing list