Attachment 701215 Details for Bug 912143 – Follow up dist-git patch to remove now obsolete editing of glance-cache-* utils to pick up dist config.

[patch] Follow up dist-git patch to remove now obsolete editing of glance-cache-* utils to pick up dist config.

0001-Remove-patching-of-glance-cache-util-config.patch (text/plain), 1.99 KB, created by Eoghan Glynn on 2013-02-22 15:09:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Eoghan Glynn

Created: 2013-02-22 15:09:57 UTC

Size: 1.99 KB

patch

obsolete

>From 7e6311bfbfd7ec9007669f2aaf4f8b2b6fe9e9a7 Mon Sep 17 00:00:00 2001
>From: Eoghan Glynn <eglynn@redhat.com>
>Date: Fri, 22 Feb 2013 14:58:08 +0000
>Subject: [PATCH] Remove patching of glance-cache-* util config
>
>This is no longer necessary, having been superceeded by:
>
>  https://code.engineering.redhat.com/gerrit/gitweb?p=glance.git;a=commit;h=25881531
>
>where the distribution config is now automatically added
>to the default set of config files.
>---
> openstack-glance.spec |   15 +--------------
> 1 files changed, 1 insertions(+), 14 deletions(-)
>
>diff --git a/openstack-glance.spec b/openstack-glance.spec
>index a759bde..1420537 100644
>--- a/openstack-glance.spec
>+++ b/openstack-glance.spec
>@@ -1,6 +1,6 @@
> Name:             openstack-glance
> Version:          2012.2.3
>-Release:          1%{?dist}
>+Release:          2%{?dist}
> Summary:          OpenStack Image Service
> 
> Group:            Applications/System
>@@ -230,19 +230,6 @@ 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 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("--config-file")\
>-    sys.argv.append("/etc/glance/glance-cache.conf")' bin/glance-cache-$role
>-
>-    install -p -D -m 755 bin/glance-cache-$role %{buildroot}%{_bindir}/glance-cache-$role
>-done
>-
> # Initscripts
> install -p -D -m 755 %{SOURCE1} %{buildroot}%{_initrddir}/openstack-glance-api
> install -p -D -m 755 %{SOURCE2} %{buildroot}%{_initrddir}/openstack-glance-registry
>-- 
>1.7.7.6
>

Flags:

pbrady: review+

Actions: View | Diff

Attachments on bug 912143: 700130 | 701215