[openstack-glance] move paste.ini config to dist config in /usr/share/glance

[Pádraig Brady]

commit 568b38d514ad185dabf590c52f800a117029b7b4
Author: Pádraig Brady <P at draigBrady.com>
Date:   Wed Oct 2 15:55:08 2013 +0100

    move paste.ini config to dist config in /usr/share/glance

 openstack-glance.spec |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/openstack-glance.spec b/openstack-glance.spec
index 9e499ef..bb92539 100644
--- a/openstack-glance.spec
+++ b/openstack-glance.spec
@@ -169,15 +169,16 @@ rm -f %{buildroot}%{_sysconfdir}/schema-image.json
 rm -f %{buildroot}/usr/share/doc/glance/README.rst
 
 # Setup directories
+install -d -m 755 %{buildroot}%{_datadir}/glance
 install -d -m 755 %{buildroot}%{_sharedstatedir}/glance/images
 
 # Config file
 install -p -D -m 640 etc/glance-api.conf %{buildroot}%{_sysconfdir}/glance/glance-api.conf
 install -p -D -m 640 %{SOURCE5} %{buildroot}%{_datadir}/glance/glance-api-dist.conf
-install -p -D -m 640 etc/glance-api-paste.ini %{buildroot}%{_sysconfdir}/glance/glance-api-paste.ini
+install -p -D -m 640 etc/glance-api-paste.ini %{buildroot}%{_datadir}/glance/glance-api-dist-paste.ini
 install -p -D -m 640 etc/glance-registry.conf %{buildroot}%{_sysconfdir}/glance/glance-registry.conf
 install -p -D -m 640 %{SOURCE6} %{buildroot}%{_datadir}/glance/glance-registry-dist.conf
-install -p -D -m 640 etc/glance-registry-paste.ini %{buildroot}%{_sysconfdir}/glance/glance-registry-paste.ini
+install -p -D -m 640 etc/glance-registry-paste.ini %{buildroot}%{_datadir}/glance/glance-registry-dist-paste.ini
 install -p -D -m 640 etc/glance-cache.conf %{buildroot}%{_sysconfdir}/glance/glance-cache.conf
 install -p -D -m 640 %{SOURCE7} %{buildroot}%{_datadir}/glance/glance-cache-dist.conf
 install -p -D -m 640 etc/glance-scrubber.conf %{buildroot}%{_sysconfdir}/glance/glance-scrubber.conf
@@ -199,6 +200,7 @@ for svc in api registry; do
   openstack-config --set %{buildroot}%{_datadir}/glance/glance-$svc-dist.conf keystone_authtoken auth_host 127.0.0.1
   openstack-config --set %{buildroot}%{_datadir}/glance/glance-$svc-dist.conf keystone_authtoken auth_port 35357
   openstack-config --set %{buildroot}%{_datadir}/glance/glance-$svc-dist.conf keystone_authtoken auth_protocol http
+  openstack-config --set %{buildroot}%{_datadir}/glance/glance-$svc-dist.conf paste_deploy config_file %{_datadir}/glance/glance-$svc-dist-paste.ini
 done
 openstack-config --set %{buildroot}%{_datadir}/glance/glance-cache-dist.conf DEFAULT image_cache_dir %{_localstatedir}/lib/glance/image-cache/
 openstack-config --set %{buildroot}%{_datadir}/glance/glance-cache-dist.conf DEFAULT log_file %{_localstatedir}/log/glance/image-cache.log
@@ -270,6 +272,8 @@ fi
 %attr(0640, root, glance) %{_datadir}/glance/glance-registry-dist.conf
 %attr(0640, root, glance) %{_datadir}/glance/glance-cache-dist.conf
 %attr(0640, root, glance) %{_datadir}/glance/glance-scrubber-dist.conf
+%attr(-, root, glance) %{_datadir}/glance/glance-api-dist-paste.ini
+%attr(-, root, glance) %{_datadir}/glance/glance-registry-dist-paste.ini
 
 %{_unitdir}/openstack-glance-api.service
 %{_unitdir}/openstack-glance-registry.service
@@ -277,9 +281,7 @@ fi
 %{_mandir}/man1/glance*.1.gz
 %dir %{_sysconfdir}/glance
 %config(noreplace) %attr(-, root, glance) %{_sysconfdir}/glance/glance-api.conf
-%config(noreplace) %attr(-, root, glance) %{_sysconfdir}/glance/glance-api-paste.ini
 %config(noreplace) %attr(-, root, glance) %{_sysconfdir}/glance/glance-registry.conf
-%config(noreplace) %attr(-, root, glance) %{_sysconfdir}/glance/glance-registry-paste.ini
 %config(noreplace) %attr(-, root, glance) %{_sysconfdir}/glance/glance-cache.conf
 %config(noreplace) %attr(-, root, glance) %{_sysconfdir}/glance/glance-scrubber.conf
 %config(noreplace) %attr(-, root, glance) %{_sysconfdir}/glance/policy.json