[openstack-keystone/el6-havana] merge side-effects

[Alan Pevec]

commit 6474e2250516fd498f97688ee49b249a6d0ab83c
Author: Alan Pevec <apevec at redhat.com>
Date:   Tue Sep 10 00:24:21 2013 +0200

    merge side-effects
    
    - el6 includes sample upstart job
    - fix again 750 for logging dir

 openstack-keystone.spec |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/openstack-keystone.spec b/openstack-keystone.spec
index 2b0aac9..ac59b92 100644
--- a/openstack-keystone.spec
+++ b/openstack-keystone.spec
@@ -219,6 +219,7 @@ fi
 %attr(0640, root, keystone) %{_datadir}/keystone/keystone-dist.conf
 %attr(0640, root, keystone) %{_datadir}/keystone/keystone-dist-paste.ini
 %attr(0755, root, root) %{_datadir}/keystone/sample_data.sh
+%{_datadir}/keystone/%{name}.upstart
 %{_initrddir}/openstack-keystone
 %dir %attr(0750, root, keystone) %{_sysconfdir}/keystone
 %config(noreplace) %attr(-, root, keystone) %{_sysconfdir}/keystone/keystone.conf
@@ -227,7 +228,6 @@ fi
 %config(noreplace) %attr(-, keystone, keystone) %{_sysconfdir}/keystone/policy.json
 %config(noreplace) %{_sysconfdir}/logrotate.d/openstack-keystone
 %dir %attr(-, keystone, keystone) %{_sharedstatedir}/keystone
-%dir %attr(-, keystone, keystone) %{_localstatedir}/log/keystone
 %dir %attr(0750, keystone, keystone) %{_localstatedir}/log/keystone
 %dir %attr(-, keystone, keystone) %{_localstatedir}/run/keystone