[openstack-glance/el6: 2/3] Merge branch 'f18' into el6
Pádraig Brady
pbrady at fedoraproject.org
Mon May 13 14:31:37 UTC 2013
commit 95965e0b70b032dd5e559ceccbd322b09df33773
Merge: 7322559 fbc9d59
Author: Pádraig Brady <P at draigBrady.com>
Date: Mon May 13 15:12:26 2013 +0100
Merge branch 'f18' into el6
Conflicts:
openstack-glance.spec
openstack-glance-scrubber.init | 103 +++++++++++++++++++++++++++++++++++++
openstack-glance-scrubber.upstart | 8 +++
openstack-glance.spec | 21 +++++---
3 files changed, 125 insertions(+), 7 deletions(-)
---
diff --cc openstack-glance-scrubber.init
index 0000000,0000000..68daa9f
new file mode 100644
--- /dev/null
+++ b/openstack-glance-scrubber.init
@@@ -1,0 -1,0 +1,103 @@@
++#!/bin/sh
++#
++# openstack-glance-scrubber OpenStack Image Service scrubber daemon
++#
++# chkconfig: - 98 02
++# description: OpenStack Image Service (code-named Glance) scrubber daemon
++
++### BEGIN INIT INFO
++# Provides:
++# Required-Start: $remote_fs $network $syslog
++# Required-Stop: $remote_fs $syslog
++# Default-Stop: 0 1 6
++# Short-Description: Glance scrubber daemon
++# Description: OpenStack Image Service (code-named Glance) scrubber daemon
++### END INIT INFO
++
++. /etc/rc.d/init.d/functions
++
++suffix=scrubber
++prog=openstack-glance-$suffix
++exec="/usr/bin/glance-$suffix"
++dist_config="/usr/share/glance/glance-$suffix-dist.conf"
++user_config="/etc/glance/glance-$suffix.conf"
++pidfile="/var/run/glance/glance-$suffix.pid"
++
++[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
++
++lockfile=/var/lock/subsys/$prog
++
++start() {
++ [ -x $exec ] || exit 5
++ [ -f $dist_config ] || exit 6
++ [ -f $user_config ] || exit 7
++ echo -n $"Starting $prog: "
++ daemon --user glance --pidfile $pidfile "$exec --daemon --config-file $dist_config --config-file $user_config --verbose &>/dev/null & echo \$! > $pidfile"
++ retval=$?
++ echo
++ [ $retval -eq 0 ] && touch $lockfile
++ return $retval
++}
++
++stop() {
++ echo -n $"Stopping $prog: "
++ killproc -p $pidfile $prog
++ retval=$?
++ echo
++ [ $retval -eq 0 ] && rm -f $lockfile
++ return $retval
++}
++
++restart() {
++ stop
++ start
++}
++
++reload() {
++ restart
++}
++
++force_reload() {
++ restart
++}
++
++rh_status() {
++ status -p $pidfile $prog
++}
++
++rh_status_q() {
++ rh_status >/dev/null 2>&1
++}
++
++
++case "$1" in
++ start)
++ rh_status_q && exit 0
++ $1
++ ;;
++ stop)
++ rh_status_q || exit 0
++ $1
++ ;;
++ restart)
++ $1
++ ;;
++ reload)
++ rh_status_q || exit 7
++ $1
++ ;;
++ force-reload)
++ force_reload
++ ;;
++ status)
++ rh_status
++ ;;
++ condrestart|try-restart)
++ rh_status_q || exit 0
++ restart
++ ;;
++ *)
++ echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
++ exit 2
++esac
++exit $?
diff --cc openstack-glance-scrubber.upstart
index 0000000,0000000..a06cd6c
new file mode 100644
--- /dev/null
+++ b/openstack-glance-scrubber.upstart
@@@ -1,0 -1,0 +1,8 @@@
++description "OpenStack Image Service (code-named Glance) API server"
++
++start on stopped rc RUNLEVEL=[2345]
++stop on runlevel [S016]
++
++respawn
++
++exec su -s /bin/sh -c "exec /usr/bin/glance-scrubber --daemon --config-file /usr/share/lib/glance/glance-scrubber-dist.conf --config-file /etc/glance/glance-scrubber.conf" glance
diff --cc openstack-glance.spec
index ef6a690,4efd87c..30aae26
--- a/openstack-glance.spec
+++ b/openstack-glance.spec
@@@ -1,20 -1,19 +1,19 @@@
--#
--# This is 2012.2 folsom release
--#
Name: openstack-glance
Version: 2012.2.4
- Release: 1%{?dist}
+ Release: 2%{?dist}
Summary: OpenStack Image Service
Group: Applications/System
License: ASL 2.0
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-scrubber.service
+Source1: openstack-glance-api.init
+Source100: openstack-glance-api.upstart
+Source2: openstack-glance-registry.init
+Source200: openstack-glance-registry.upstart
- Source3: openstack-glance.logrotate
++Source3: openstack-glance-scrubber.init
++Source300: openstack-glance-scrubber.upstart
+ Source4: openstack-glance.logrotate
#
# patches_base=2012.2.4
@@@ -199,15 -188,12 +198,17 @@@ install -p -D -m 640 etc/policy.json %{
install -p -D -m 640 etc/schema-image.json %{buildroot}%{_sysconfdir}/glance/schema-image.json
# 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
+install -p -D -m 755 %{SOURCE1} %{buildroot}%{_initrddir}/openstack-glance-api
+install -p -D -m 755 %{SOURCE2} %{buildroot}%{_initrddir}/openstack-glance-registry
++install -p -D -m 755 %{SOURCE3} %{buildroot}%{_initrddir}/openstack-glance-scrubber
+
+# Install upstart jobs examples
+install -p -m 644 %{SOURCE100} %{buildroot}%{_datadir}/glance/
+install -p -m 644 %{SOURCE200} %{buildroot}%{_datadir}/glance/
++install -p -m 644 %{SOURCE300} %{buildroot}%{_datadir}/glance/
# 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
@@@ -223,15 -209,30 +224,18 @@@ useradd -u 161 -r -g glance -d %{_share
exit 0
%post
-if [ $1 -eq 1 ] ; then
- # Initial installation
- /bin/systemctl daemon-reload >/dev/null 2>&1 || :
-fi
-
+/sbin/chkconfig --add openstack-glance-api
+/sbin/chkconfig --add openstack-glance-registry
++/sbin/chkconfig --add openstack-glance-scrubber
%preun
-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
-/bin/systemctl daemon-reload >/dev/null 2>&1 || :
-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 || :
+if [ $1 = 0 ] ; then
+ /sbin/service openstack-glance-api stop >/dev/null 2>&1
+ /sbin/chkconfig --del openstack-glance-api
+ /sbin/service openstack-glance-registry stop >/dev/null 2>&1
+ /sbin/chkconfig --del openstack-glance-registry
++ /sbin/service openstack-glance-scrubber stop >/dev/null 2>&1
++ /sbin/chkconfig --del openstack-glance-scrubber
fi
%files
@@@ -246,11 -247,10 +250,13 @@@
%{_bindir}/glance-cache-pruner
%{_bindir}/glance-scrubber
%{_bindir}/glance-replicator
-
-%{_unitdir}/openstack-glance-api.service
-%{_unitdir}/openstack-glance-registry.service
-%{_unitdir}/openstack-glance-scrubber.service
+%{_initrddir}/openstack-glance-api
+%{_initrddir}/openstack-glance-registry
++%{_initrddir}/openstack-glance-scrubber
+%dir %{_datadir}/glance
+%{_datadir}/glance/openstack-glance-api.upstart
+%{_datadir}/glance/openstack-glance-registry.upstart
++%{_datadir}/glance/openstack-glance-scrubber.upstart
%{_mandir}/man1/glance*.1.gz
%dir %{_sysconfdir}/glance
%config(noreplace) %attr(-, root, glance) %{_sysconfdir}/glance/glance-api.conf
@@@ -276,12 -276,10 +282,13 @@@
%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
+* Mon May 13 2013 Pádraig Brady <P at draigBrady.com> 2012.2.3-2
+- Avoid issue with crypto compat patch (#906051)
+
* Fri Feb 01 2013 Pádraig Brady <P at draigBrady.com> 2012.2.3-1
- Update to stable release 2012.2.3
More information about the scm-commits
mailing list