[openstack-keystone/el6] fix initscript for keystone

[Alan Pevec]

commit fd1e19a01aa143747f1fb748b45ce7144de016bd
Author: Alan Pevec <apevec at redhat.com>
Date:   Sun Dec 4 12:11:23 2011 +0100

    fix initscript for keystone

 openstack-keystone.init |    3 +--
 openstack-keystone.spec |    5 ++++-
 2 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/openstack-keystone.init b/openstack-keystone.init
old mode 100644
new mode 100755
index 399617a..a6f5410
--- a/openstack-keystone.init
+++ b/openstack-keystone.init
@@ -14,7 +14,6 @@ prog=keystone
 exec="/usr/bin/$prog"
 config="/etc/$prog/$prog.conf"
 pidfile="/var/run/$prog/$prog.pid"
-logfile="/var/log/$prog/$prog.log"
 
 [ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
 
@@ -24,7 +23,7 @@ start() {
     [ -x $exec ] || exit 5
     [ -f $config ] || exit 6
     echo -n $"Starting $prog: "
-    daemon --user keystone --pidfile $pidfile "$exec --flagfile $config --logfile $logfile &>/dev/null & echo \$! > $pidfile"
+    daemon --user keystone --pidfile $pidfile "$exec --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 423a033..e9d1a90 100644
--- a/openstack-keystone.spec
+++ b/openstack-keystone.spec
@@ -9,7 +9,7 @@
 
 Name:           openstack-keystone
 Version:        2011.3.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        OpenStack Identity Service
 
 License:        ASL 2.0
@@ -178,6 +178,9 @@ fi
 %dir %attr(-, keystone, keystone) %{_localstatedir}/run/keystone
 
 %changelog
+* Sun Dec 04 2011 Alan Pevec <apevec at redhat.com> 2011.3.1-4
+- fix initscript for keystone
+
 * Wed Nov 30 2011 Alan Pevec <apevec at redhat.com> 2011.3.1-3
 - Use updated parallel install versions of epel packages (pbrady)
 - Ensure the docs aren't built with the system glance module (pbrady)