[openstack-glance/f18] add the scrubber service to support deferred image deletion

[Pádraig Brady]

commit fbc9d599c5f2ad4ae5cb54180502310e5fc8595e
Author: Pádraig Brady <P at draigBrady.com>
Date:   Mon May 13 14:58:31 2013 +0100

    add the scrubber service to support deferred image deletion
    
    Conflicts:
    
    	openstack-glance.spec

 openstack-glance-scrubber.service |   13 +++++++++++++
 openstack-glance.spec             |   16 ++++++++++++----
 2 files changed, 25 insertions(+), 4 deletions(-)
---
diff --git a/openstack-glance-scrubber.service b/openstack-glance-scrubber.service
new file mode 100644
index 0000000..ea1acb4
--- /dev/null
+++ b/openstack-glance-scrubber.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=OpenStack Image Service deferred image deletion service
+After=syslog.target network.target
+
+[Service]
+Type=simple
+User=glance
+ExecStart=/usr/bin/glance-scrubber --config-file /etc/glance/glance-scrubber.conf
+PrivateTmp=true
+
+[Install]
+WantedBy=multi-user.target
+
diff --git a/openstack-glance.spec b/openstack-glance.spec
index feff758..4efd87c 100644
--- a/openstack-glance.spec
+++ b/openstack-glance.spec
@@ -3,7 +3,7 @@
 #
 Name:             openstack-glance
 Version:          2012.2.4
-Release:          1%{?dist}
+Release:          2%{?dist}
 Summary:          OpenStack Image Service
 
 Group:            Applications/System
@@ -12,7 +12,8 @@ URL:              http://glance.openstack.org
 Source0:          https://launchpad.net/glance/folsom/%{version}/+download/glance-%{version}.tar.gz
 Source1:          openstack-glance-api.service
 Source2:          openstack-glance-registry.service
-Source3:          openstack-glance.logrotate
+Source3:          openstack-glance-scrubber.service
+Source4:          openstack-glance.logrotate
 
 #
 # patches_base=2012.2.4
@@ -142,6 +143,7 @@ openstack-config --set etc/glance-registry.conf keystone_authtoken auth_host 127
 openstack-config --set etc/glance-registry.conf keystone_authtoken auth_port 35357
 openstack-config --set etc/glance-registry.conf keystone_authtoken auth_protocol http
 
+
 %{__python} setup.py build
 
 %install
@@ -188,9 +190,10 @@ install -p -D -m 640 etc/schema-image.json %{buildroot}%{_sysconfdir}/glance/sch
 # Initscripts
 install -p -D -m 644 %{SOURCE1} %{buildroot}%{_unitdir}/openstack-glance-api.service
 install -p -D -m 644 %{SOURCE2} %{buildroot}%{_unitdir}/openstack-glance-registry.service
+install -p -D -m 644 %{SOURCE3} %{buildroot}%{_unitdir}/openstack-glance-scrubber.service
 
 # Logrotate config
-install -p -D -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/logrotate.d/openstack-glance
+install -p -D -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/logrotate.d/openstack-glance
 
 # Install pid directory
 install -d -m 755 %{buildroot}%{_localstatedir}/run/glance
@@ -217,8 +220,10 @@ if [ $1 -eq 0 ] ; then
     # Package removal, not upgrade
     /bin/systemctl --no-reload disable openstack-glance-api.service > /dev/null 2>&1 || :
     /bin/systemctl --no-reload disable openstack-glance-registry.service > /dev/null 2>&1 || :
+    /bin/systemctl --no-reload disable openstack-glance-scrubber.service > /dev/null 2>&1 || :
     /bin/systemctl stop openstack-glance-api.service > /dev/null 2>&1 || :
     /bin/systemctl stop openstack-glance-registry.service > /dev/null 2>&1 || :
+    /bin/systemctl stop openstack-glance-scrubber.service > /dev/null 2>&1 || :
 fi
 
 %postun
@@ -227,6 +232,7 @@ if [ $1 -ge 1 ] ; then
     # Package upgrade, not uninstall
     /bin/systemctl try-restart openstack-glance-api.service >/dev/null 2>&1 || :
     /bin/systemctl try-restart openstack-glance-registry.service >/dev/null 2>&1 || :
+    /bin/systemctl try-restart openstack-glance-scrubber.service >/dev/null 2>&1 || :
 fi
 
 %files
@@ -244,6 +250,7 @@ fi
 
 %{_unitdir}/openstack-glance-api.service
 %{_unitdir}/openstack-glance-registry.service
+%{_unitdir}/openstack-glance-scrubber.service
 %{_mandir}/man1/glance*.1.gz
 %dir %{_sysconfdir}/glance
 %config(noreplace) %attr(-, root, glance) %{_sysconfdir}/glance/glance-api.conf
@@ -269,8 +276,9 @@ fi
 %doc doc/build/html
 
 %changelog
-* Mon May 13 2013 Pádraig Brady <P at draigBrady.com> 2012.2.4-1
+* Mon May 13 2013 Pádraig Brady <P at draigBrady.com> 2012.2.4-2
 - Update to stable release 2012.2.4
+- Add the scrubber service for deferred image deletion
 
 * Fri Feb 01 2013 Pádraig Brady <P at draigBrady.com> 2012.2.3-1
 - Update to stable release 2012.2.3