Attachment 700130 Details for Bug 912143 – Proposed fix for review.

[patch] Proposed fix for review.

0001-Modify-glance-manage-to-pick-up-glance-registry-dist.patch (text/plain), 2.31 KB, created by Eoghan Glynn on 2013-02-20 16:31:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Eoghan Glynn

Created: 2013-02-20 16:31:02 UTC

Size: 2.31 KB

patch

obsolete

>From 64967aa3027186dfa1e3c1164f59d012d904696e Mon Sep 17 00:00:00 2001
>From: Eoghan Glynn <eglynn@redhat.com>
>Date: Wed, 20 Feb 2013 11:04:32 -0500
>Subject: [PATCH] Modify glance-manage to pick up glance-registry-dist.conf
>
>Fixes bug: 912143
>
>Since we now place the sql_connection config option in the
>glance-{api|registry}.conf (as opposed to in the user-editable
>config under /etc/glance as before), we need to ensure that the
>glance-manage utility picks up the distribution config by default
>in order to initiate DB migrations.
>---
> openstack-glance.spec |   14 ++++++++++++--
> 1 files changed, 12 insertions(+), 2 deletions(-)
>
>diff --git a/openstack-glance.spec b/openstack-glance.spec
>index a759bde..1d75fb0 100644
>--- a/openstack-glance.spec
>+++ b/openstack-glance.spec
>@@ -230,15 +230,25 @@ openstack-config --set %{buildroot}%{_datadir}/glance/glance-cache-dist.conf DEF
> openstack-config --set %{buildroot}%{_datadir}/glance/glance-scrubber-dist.conf DEFAULT scrubber_datadir %{_localstatedir}/lib/glance/scrubber
> openstack-config --set %{buildroot}%{_datadir}/glance/glance-scrubber-dist.conf DEFAULT log_file %{_localstatedir}/log/glance/scrubber.log
> 
>+# Modify glance-manage utility to pick up distribution config by default
>+sed -i '/^CONF = cfg.CONF$/ a\
>+if (not("--config-file" in sys.argv or "--config-dir" in sys.argv)):\
>+    sys.argv.append("--config-file")\
>+    sys.argv.append("%{_datadir}/glance/glance-registry-dist.conf")\
>+    sys.argv.append("--config-file")\
>+    sys.argv.append("%{_sysconfdir}/glance/glance-registry.conf")' bin/glance-manage
>+
>+install -p -D -m 755 bin/glance-manage %{buildroot}%{_bindir}/glance-manage
>+
> # Modify cache utilities to pick up distribution config by default
> for role in cleaner prefetcher pruner
> do
>     sed -i '/^CONF = cfg.CONF$/ a\
> if (not("--config-file" in sys.argv or "--config-dir" in sys.argv)):\
>     sys.argv.append("--config-file")\
>-    sys.argv.append("/usr/share/glance/glance-cache-dist.conf")\
>+    sys.argv.append("%{_datadir}/glance/glance-cache-dist.conf")\
>     sys.argv.append("--config-file")\
>-    sys.argv.append("/etc/glance/glance-cache.conf")' bin/glance-cache-$role
>+    sys.argv.append("%{_sysconfdir}/glance/glance-cache.conf")' bin/glance-cache-$role
> 
>     install -p -D -m 755 bin/glance-cache-$role %{buildroot}%{_bindir}/glance-cache-$role
> done
>-- 
>1.7.7.6
>

Actions: View | Diff

Attachments on bug 912143: 700130 | 701215