Attachment 709310 Details for Bug 887815 – dist-git patch

[patch] dist-git patch

0001-separate-paste.deploy-configuration.patch (text/plain), 6.79 KB, created by Alan Pevec on 2013-03-13 03:23:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alan Pevec

Created: 2013-03-13 03:23:35 UTC

Size: 6.79 KB

patch

obsolete

>From 7b6afbd714acef09b541c05b4d1b695aa314b9bc Mon Sep 17 00:00:00 2001
>From: Alan Pevec <apevec@redhat.com>
>Date: Wed, 13 Mar 2013 03:45:19 +0100
>Subject: [PATCH] separate paste.deploy configuration
>
>Resolves: rhbz#887815
>---
> keystone-dist.conf             | 29 +++++++++++++++++++++++++++++
> openstack-keystone-sample-data |  2 +-
> openstack-keystone.init        |  3 ++-
> openstack-keystone.spec        | 27 ++++++++++++---------------
> openstack-keystone.upstart     |  2 +-
> 5 files changed, 45 insertions(+), 18 deletions(-)
> create mode 100644 keystone-dist.conf
>
>diff --git a/keystone-dist.conf b/keystone-dist.conf
>new file mode 100644
>index 0000000..e6534de
>--- /dev/null
>+++ b/keystone-dist.conf
>@@ -0,0 +1,29 @@
>+[DEFAULT]
>+log_file = /var/log/keystone/keystone.log
>+
>+[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
>index c5eeb53..0faa895 100755
>--- a/openstack-keystone-sample-data
>+++ b/openstack-keystone-sample-data
>@@ -1,3 +1,3 @@
> #!/bin/bash
> 
>-ENABLE_ENDPOINTS=1 /usr/share/openstack-keystone/sample_data.sh "$@"
>+ENABLE_ENDPOINTS=1 /usr/share/keystone/sample_data.sh "$@"
>diff --git a/openstack-keystone.init b/openstack-keystone.init
>index 084fcc8..da1fb88 100755
>--- a/openstack-keystone.init
>+++ b/openstack-keystone.init
>@@ -13,6 +13,7 @@
> 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"
> 
> [ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
>@@ -23,7 +24,7 @@ start() {
>     [ -x $exec ] || exit 5
>     [ -f $config ] || exit 6
>     echo -n $"Starting $prog: "
>-    daemon --user keystone --pidfile $pidfile "$exec --config-file $config &>/dev/null & echo \$! > $pidfile"
>+    daemon --user keystone --pidfile $pidfile "$exec --config-file $distconfig --config-file $config &>/dev/null & echo \$! > $pidfile"
>     retval=$?
>     echo
>     [ $retval -eq 0 ] && touch $lockfile
>diff --git a/openstack-keystone.spec b/openstack-keystone.spec
>index 0ee1646..f80ac2d 100644
>--- a/openstack-keystone.spec
>+++ b/openstack-keystone.spec
>@@ -7,18 +7,17 @@
> 
> Name:           openstack-keystone
> Version:        2012.2.3
>-Release:        4%{?dist}
>-#Release:        0.1.%{release_letter}%{milestone}%{?dist}
>+Release:        5%{?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
>-#Source0:        http://launchpad.net/keystone/%{release_name}/%{release_name}-%{milestone}/+download/keystone-%{version}~%{release_letter}%{milestone}.tar.gz
> Source1:        openstack-keystone.logrotate
> Source2:        openstack-keystone.init
> Source3:        openstack-keystone.upstart
> Source5:        openstack-keystone-sample-data
>+Source20:       keystone-dist.conf
> 
> 
> #
>@@ -148,15 +147,8 @@ find keystone -name \*.py -exec sed -i '/\/usr\/bin\/env python/d' {} \;
> %build
> # change default configuration
> cp etc/keystone.conf.sample etc/keystone.conf
>-openstack-config --set etc/keystone.conf DEFAULT log_file %{_localstatedir}/log/keystone/keystone.log
>-openstack-config --set etc/keystone.conf sql connection mysql://keystone:keystone@localhost/keystone
>-openstack-config --set etc/keystone.conf catalog template_file %{_sysconfdir}/keystone/default_catalog.templates
>-openstack-config --set etc/keystone.conf catalog driver keystone.catalog.backends.sql.Catalog
>-openstack-config --set etc/keystone.conf identity driver keystone.identity.backends.sql.Identity
>-openstack-config --set etc/keystone.conf token driver keystone.token.backends.sql.Token
>-openstack-config --set etc/keystone.conf ec2 driver keystone.contrib.ec2.backends.sql.Ec2
>-# don't try systemd notification on el6
>-#openstack-config --set etc/keystone.conf DEFAULT onready keystone.common.systemd
>+# config_file is defined in keystone-dist.conf
>+openstack-config --del etc/keystone.conf paste_deploy config_file
> 
> %{__python} setup.py build
> 
>@@ -169,14 +161,16 @@ 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 640 etc/keystone-paste.ini %{buildroot}%{_datadir}/keystone/keystone-dist-paste.ini
>+install -p -D -m 640 %{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
> 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}/%{name}/sample_data.sh
>-install -p -D -m 644 %{SOURCE3} %{buildroot}%{_datadir}/%{name}/%{name}.upstart
>+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 -d -m 755 %{buildroot}%{_sharedstatedir}/keystone
>@@ -247,7 +241,7 @@ fi
> %{_bindir}/keystone-all
> %{_bindir}/keystone-manage
> %{_bindir}/openstack-keystone-sample-data
>-%{_datadir}/%{name}
>+%{_datadir}/keystone
> %{_initrddir}/openstack-keystone
> %dir %attr(0750, root, keystone) %{_sysconfdir}/keystone
> %config(noreplace) %attr(-, root, keystone) %{_sysconfdir}/keystone/keystone.conf
>@@ -271,6 +265,9 @@ fi
> %endif
> 
> %changelog
>+* Tue Mar 12 2013 Alan Pevec <apevec@redhat.com> 2012.2.3-5
>+- separate paste.deploy configuration rhbz#887815
>+
> * Mon Feb 25 2013 Alan Pevec <apevec@redhat.com> 2012.2.3-4
> - URL-encode user-supplied tokens rhbz#866451
> 
>diff --git a/openstack-keystone.upstart b/openstack-keystone.upstart
>index 84e19ae..02a2623 100644
>--- a/openstack-keystone.upstart
>+++ b/openstack-keystone.upstart
>@@ -9,4 +9,4 @@ stop on runlevel [S016]
> 
> respawn
> 
>-exec su -s /bin/sh -c "exec keystone-all" keystone
>+exec su -s /bin/sh -c "exec keystone-all --config-file /usr/share/keystone/keystone-dist.conf --config-file /etc/keystone/keystone.conf" keystone
>-- 
>1.7.11.7
>

Flags:

ayoung: review+

Actions: View | Diff

Attachments on bug 887815: 709299 | 709310 | 713375