[openstack-glance/el6-havana] fix dist.conf issues

[Pádraig Brady]

commit 0d7699a9d053ea46841a3cc73ce739fb3365aed7
Author: Pádraig Brady <P at draigBrady.com>
Date:   Wed Sep 25 16:57:05 2013 +0100

    fix dist.conf issues

 glance-registry-dist.conf         |    2 +-
 openstack-glance-api.init         |    2 +-
 openstack-glance-api.upstart      |    3 ++-
 openstack-glance-registry.init    |    2 +-
 openstack-glance-registry.upstart |    3 ++-
 openstack-glance-scrubber.init    |    2 +-
 openstack-glance-scrubber.upstart |    3 ++-
 openstack-glance.spec             |   16 +++++++++++-----
 8 files changed, 21 insertions(+), 12 deletions(-)
---
diff --git a/glance-registry-dist.conf b/glance-registry-dist.conf
index 4384f2e..ad3fe20 100644
--- a/glance-registry-dist.conf
+++ b/glance-registry-dist.conf
@@ -8,7 +8,7 @@ sql_connection = mysql://glance:glance@localhost/glance
 
 admin_tenant_name = %%SERVICE_TENANT_NAME%%
 admin_user = %SERVICE_USER%
-admin_password %SERVICE_PASSWORD%
+admin_password = %SERVICE_PASSWORD%
 auth_host = 127.0.0.1
 auth_port = 35357
 auth_protocol = http
diff --git a/openstack-glance-api.init b/openstack-glance-api.init
index c23d954..222c804 100644
--- a/openstack-glance-api.init
+++ b/openstack-glance-api.init
@@ -20,7 +20,7 @@ suffix=api
 prog=openstack-glance-$suffix
 exec="/usr/bin/glance-$suffix"
 config="/etc/glance/glance-$suffix.conf"
-distconfig="/usr/share/glance/glance-$suffix.conf"
+distconfig="/usr/share/glance/glance-$suffix-dist.conf"
 pidfile="/var/run/glance/glance-$suffix.pid"
 
 [ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
diff --git a/openstack-glance-api.upstart b/openstack-glance-api.upstart
index 1539397..e0dce4a 100644
--- a/openstack-glance-api.upstart
+++ b/openstack-glance-api.upstart
@@ -5,4 +5,5 @@ stop on runlevel [S016]
 
 respawn
 
-exec su -s /bin/sh -c "exec /usr/bin/glance-api --config-file /etc/glance/glance-api.conf" glance
+exec su -s /bin/sh -c "exec /usr/bin/glance-api --config-file /usr/share/glance/glance-api-dist.conf \
+                       --config-file /etc/glance/glance-api.conf" glance
diff --git a/openstack-glance-registry.init b/openstack-glance-registry.init
index b85efc1..9091bd1 100644
--- a/openstack-glance-registry.init
+++ b/openstack-glance-registry.init
@@ -20,7 +20,7 @@ suffix=registry
 prog=openstack-glance-$suffix
 exec="/usr/bin/glance-$suffix"
 config="/etc/glance/glance-$suffix.conf"
-distconfig="/usr/share/glance/glance-$suffix.conf"
+distconfig="/usr/share/glance/glance-$suffix-dist.conf"
 pidfile="/var/run/glance/glance-$suffix.pid"
 
 [ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
diff --git a/openstack-glance-registry.upstart b/openstack-glance-registry.upstart
index eccae41..20e74f7 100644
--- a/openstack-glance-registry.upstart
+++ b/openstack-glance-registry.upstart
@@ -5,4 +5,5 @@ stop on runlevel [S016]
 
 respawn
 
-exec su -s /bin/sh -c "exec /usr/bin/glance-registry --config-file /etc/glance/glance-registry.conf" glance
+exec su -s /bin/sh -c "exec /usr/bin/glance-registry --config-file /usr/share/glance/glance-registry-dist.conf \
+                       --config-file /etc/glance/glance-registry.conf" glance
diff --git a/openstack-glance-scrubber.init b/openstack-glance-scrubber.init
index 896f082..f202940 100644
--- a/openstack-glance-scrubber.init
+++ b/openstack-glance-scrubber.init
@@ -20,7 +20,7 @@ suffix=scrubber
 prog=openstack-glance-$suffix
 exec="/usr/bin/glance-$suffix"
 user_config="/etc/glance/glance-$suffix.conf"
-distconfig="/usr/share/glance/glance-$suffix.conf"
+distconfig="/usr/share/glance/glance-$suffix-dist.conf"
 pidfile="/var/run/glance/glance-$suffix.pid"
 
 [ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
diff --git a/openstack-glance-scrubber.upstart b/openstack-glance-scrubber.upstart
index 6c3e29a..58fab88 100644
--- a/openstack-glance-scrubber.upstart
+++ b/openstack-glance-scrubber.upstart
@@ -5,4 +5,5 @@ stop on runlevel [S016]
 
 respawn
 
-exec su -s /bin/sh -c "exec /usr/bin/glance-scrubber --daemon --config-file /etc/glance/glance-scrubber.conf" glance
+exec su -s /bin/sh -c "exec /usr/bin/glance-scrubber --daemon --config-file /usr/share/glance/glance-scrubber-dist.conf \
+                       --config-file /etc/glance/glance-scrubber.conf" glance
diff --git a/openstack-glance.spec b/openstack-glance.spec
index a22c40b..818de97 100644
--- a/openstack-glance.spec
+++ b/openstack-glance.spec
@@ -3,7 +3,7 @@
 
 Name:             openstack-glance
 Version:          2013.2
-Release:          0.9.b%{milestone}%{?dist}
+Release:          0.10.b%{milestone}%{?dist}
 Summary:          OpenStack Image Service
 
 Group:            Applications/System
@@ -273,9 +273,9 @@ fi
 %{_datadir}/glance/openstack-glance-api.upstart
 %{_datadir}/glance/openstack-glance-registry.upstart
 %{_datadir}/glance/openstack-glance-scrubber.upstart
-%{_datadir}/glance/glance-api-dist.conf
-%{_datadir}/glance/glance-registry-dist.conf
-%{_datadir}/glance/glance-scrubber-dist.conf
+%attr(0640, root, glance) %{_datadir}/glance/glance-api-dist.conf
+%attr(0640, root, glance) %{_datadir}/glance/glance-registry-dist.conf
+%attr(0640, root, glance) %{_datadir}/glance/glance-scrubber-dist.conf
 
 %{_mandir}/man1/glance*.1.gz
 %dir %{_sysconfdir}/glance
@@ -302,7 +302,13 @@ fi
 %doc doc/build/html
 
 %changelog
-* Mon Sep  9 2013 John Bresnahan <jbresnah at redhat.com> 2013.2.b3
+* Wed Sep 25 2013 Pádraig Brady <pbrady at redhat.com) 2013.2-0.10.b3
+- Fix up dist.conf issues
+
+* Thu Sep 19 2013 John Bresnahan <jbresnah at redhat.com> 2013.2-0.8.b3
+- Split distribution config to /usr/share/glance/glance*-dist.conf
+
+* Mon Sep  9 2013 John Bresnahan <jbresnah at redhat.com> 2013.2-0.7.b3
 - Update to 2013.2.b3
 - Remove runtime dep on python pbr
 - Revert use oslo.sphinx and remove local copy of doc