[openstack-keystone] avoid conflict with python-keystoneclient

[Alan Pevec]

commit e4f2734cdc76afc6929e3ce7b70fa920863626a0
Author: Alan Pevec <apevec at redhat.com>
Date:   Thu Jan 26 18:42:28 2012 +0100

    avoid conflict with python-keystoneclient
    
    workaround for
    https://bugs.launchpad.net/keystone/+bug/910484

 openstack-keystone.service |    2 +-
 openstack-keystone.spec    |    5 +++++
 2 files changed, 6 insertions(+), 1 deletions(-)
---
diff --git a/openstack-keystone.service b/openstack-keystone.service
index 44aa64c..2f8a4c1 100644
--- a/openstack-keystone.service
+++ b/openstack-keystone.service
@@ -5,7 +5,7 @@ After=syslog.target network.target
 [Service]
 Type=simple
 User=keystone
-ExecStart=/usr/bin/keystone --config-file /etc/keystone/keystone.conf
+ExecStart=/usr/bin/keystone-all --config-file /etc/keystone/keystone.conf
 
 [Install]
 WantedBy=multi-user.target
diff --git a/openstack-keystone.spec b/openstack-keystone.spec
index ae75de0..8893efa 100644
--- a/openstack-keystone.spec
+++ b/openstack-keystone.spec
@@ -101,6 +101,10 @@ find examples -type f -exec chmod 0664 \{\} \;
 %install
 %{__python} setup.py install -O1 --skip-build --root %{buildroot}
 
+# workaround for https://bugs.launchpad.net/keystone/+bug/910484
+# to avoid conflict with keystoneclient
+mv %{buildroot}%{_bindir}/keystone %{buildroot}%{_bindir}/keystone-all
+
 install -p -D -m 644 etc/keystone.conf %{buildroot}%{_sysconfdir}/keystone/keystone.conf
 install -p -D -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/logrotate.d/openstack-keystone
 install -p -D -m 644 %{SOURCE2} %{buildroot}%{_unitdir}/openstack-keystone.service
@@ -178,6 +182,7 @@ fi
 %changelog
 * 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