[openstack-glance] Merge spec from el6-icehouse

Flavio Percoco flaper87 at fedoraproject.org
Wed Sep 3 11:05:23 UTC 2014 

commit c4e3fd2251b424f7ac359ab49c556b27552c965f
Author: Flavio Percoco <flaper87 at gmail.com>
Date:   Wed Sep 3 11:20:14 2014 +0200

    Merge spec from el6-icehouse
    
    For RDO el6 builds in Copr.

 openstack-glance-api.init         |  101 +++++++++++++++++++++++++++++++++++++
 openstack-glance-api.upstart      |    8 +++
 openstack-glance-registry.init    |  101 +++++++++++++++++++++++++++++++++++++
 openstack-glance-registry.upstart |    8 +++
 openstack-glance-scrubber.init    |  101 +++++++++++++++++++++++++++++++++++++
 openstack-glance-scrubber.upstart |    8 +++
 openstack-glance.spec             |   97 +++++++++++++++++++++++++++++++----
 7 files changed, 412 insertions(+), 12 deletions(-)
---
diff --git a/openstack-glance-api.init b/openstack-glance-api.init
new file mode 100644
index 0000000..00c8a51
--- /dev/null
+++ b/openstack-glance-api.init
@@ -0,0 +1,101 @@
+#!/bin/sh
+#
+# openstack-glance-api OpenStack Image Service API server
+#
+# chkconfig:   - 98 02
+# description: OpenStack Image Service (code-named Glance) API server
+
+### BEGIN INIT INFO
+# Provides:
+# Required-Start: $remote_fs $network $syslog
+# Required-Stop: $remote_fs $syslog
+# Default-Stop: 0 1 6
+# Short-Description: Glance API server
+# Description: OpenStack Image Service (code-named Glance) API server
+### END INIT INFO
+
+. /etc/rc.d/init.d/functions
+
+suffix=api
+prog=openstack-glance-$suffix
+exec="/usr/bin/glance-$suffix"
+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 $config ] || exit 6
+    echo -n $"Starting $prog: "
+    daemon --user glance --pidfile $pidfile "$exec &>/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 --git a/openstack-glance-api.upstart b/openstack-glance-api.upstart
new file mode 100644
index 0000000..9697e7d
--- /dev/null
+++ b/openstack-glance-api.upstart
@@ -0,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-api" glance
diff --git a/openstack-glance-registry.init b/openstack-glance-registry.init
new file mode 100644
index 0000000..8a8850b
--- /dev/null
+++ b/openstack-glance-registry.init
@@ -0,0 +1,101 @@
+#!/bin/sh
+#
+# openstack-glance-api OpenStack Image Service API server
+#
+# chkconfig:   - 98 02
+# description: OpenStack Image Service (code-named Glance) API server
+
+### BEGIN INIT INFO
+# Provides:
+# Required-Start: $remote_fs $network $syslog
+# Required-Stop: $remote_fs $syslog
+# Default-Stop: 0 1 6
+# Short-Description: Glance API server
+# Description: OpenStack Image Service (code-named Glance) API server
+### END INIT INFO
+
+. /etc/rc.d/init.d/functions
+
+suffix=registry
+prog=openstack-glance-$suffix
+exec="/usr/bin/glance-$suffix"
+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 $config ] || exit 6
+    echo -n $"Starting $prog: "
+    daemon --user glance --pidfile $pidfile "$exec &>/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 --git a/openstack-glance-registry.upstart b/openstack-glance-registry.upstart
new file mode 100644
index 0000000..dc7f48c
--- /dev/null
+++ b/openstack-glance-registry.upstart
@@ -0,0 +1,8 @@
+description "OpenStack Image Service (code-named Glance) Registry server"
+
+start on stopped rc RUNLEVEL=[2345]
+stop on runlevel [S016]
+
+respawn
+
+exec su -s /bin/sh -c "exec /usr/bin/glance-registry" glance
diff --git a/openstack-glance-scrubber.init b/openstack-glance-scrubber.init
new file mode 100644
index 0000000..dc432e9
--- /dev/null
+++ b/openstack-glance-scrubber.init
@@ -0,0 +1,101 @@
+#!/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"
+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 $user_config ] || exit 7
+    echo -n $"Starting $prog: "
+    daemon --user glance --pidfile $pidfile "$exec --daemon &>/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 --git a/openstack-glance-scrubber.upstart b/openstack-glance-scrubber.upstart
new file mode 100644
index 0000000..3dff963
--- /dev/null
+++ b/openstack-glance-scrubber.upstart
@@ -0,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" glance
diff --git a/openstack-glance.spec b/openstack-glance.spec
index 155fc17..74abe3b 100644
--- a/openstack-glance.spec
+++ b/openstack-glance.spec
@@ -18,6 +18,13 @@ Source6:          glance-registry-dist.conf
 Source7:          glance-cache-dist.conf
 Source8:          glance-scrubber-dist.conf
 
+Source9:          openstack-glance-api.init
+Source900:        openstack-glance-api.upstart
+Source10:         openstack-glance-registry.init
+Source1000:       openstack-glance-registry.upstart
+Source11:         openstack-glance-scrubber.init
+Source1100:       openstack-glance-scrubber.upstart
+
 #
 # patches_base=2014.2.b2
 #
@@ -42,6 +49,21 @@ Requires:         openstack-utils
 BuildRequires:    python-pbr
 BuildRequires:    python-oslo-sphinx
 
+%if 0%{?rhel} == 6
+Requires(post):   chkconfig
+Requires(postun): initscripts
+Requires(preun):  chkconfig
+Requires(preun):  initscripts
+# for daemon_notify
+Requires: /usr/bin/uuidgen
+Requires: /bin/sleep
+%else
+Requires(post): systemd
+Requires(preun): systemd
+Requires(postun): systemd
+BuildRequires: systemd
+%endif
+
 %description
 OpenStack Image Service (code-named Glance) provides discovery, registration,
 and delivery services for virtual disk images. The Image Service API server
@@ -208,10 +230,24 @@ install -p -D -m 644 %{SOURCE8} %{buildroot}%{_datadir}/glance/glance-scrubber-d
 install -p -D -m 640 etc/policy.json %{buildroot}%{_sysconfdir}/glance/policy.json
 install -p -D -m 640 etc/schema-image.json %{buildroot}%{_sysconfdir}/glance/schema-image.json
 
+%if 0%{?rhel} == 6
+# Install service readiness wrapper
+install -p -D -m 755 %{SOURCE22} %{buildroot}%{_initrddir}/openstack-glance-api
+install -p -D -m 644 %{SOURCE23} %{buildroot}%{_datadir}/glance/openstack-glance-api.upstart
+
+install -p -D -m 755 %{SOURCE22} %{buildroot}%{_initrddir}/openstack-glance-registry
+install -p -D -m 644 %{SOURCE23} %{buildroot}%{_datadir}/glance/openstack-glance-registry.upstart
+
+install -p -D -m 755 %{SOURCE22} %{buildroot}%{_initrddir}/openstack-glance-scrubber
+install -p -D -m 644 %{SOURCE23} %{buildroot}%{_datadir}/glance/openstack-glance-scrubber.upstart
+%else
 # 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
+%endif
+
+
 
 # Logrotate config
 install -p -D -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/logrotate.d/openstack-glance
@@ -222,6 +258,10 @@ install -d -m 755 %{buildroot}%{_localstatedir}/run/glance
 # Install log directory
 install -d -m 755 %{buildroot}%{_localstatedir}/log/glance
 
+%if 0%{?rhel} == 6
+install -d -m 755 %{buildroot}%{_localstatedir}/run/glance
+%endif
+
 # Programmatically update defaults in sample config
 # which is installed at /etc/$project/$program.conf
 # TODO: Make this more robust
@@ -247,31 +287,51 @@ useradd -u 161 -r -g glance -d %{_sharedstatedir}/glance -s /sbin/nologin \
 exit 0
 
 %post
+%if 0%{?rhel} == 6
 if [ $1 -eq 1 ] ; then
     # Initial installation
-    /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+    /sbin/chkconfig --add openstack-glance-api
+    /sbin/chkconfig --add openstack-glance-registry
+    /sbin/chkconfig --add openstack-glance-scrubber
 fi
+%else
+# Initial installation
+%systemd_post openstack-glance-api.service
+%systemd_post openstack-glance-registry.service
+%systemd_post openstack-glance-scrubber.service
+%endif
 
 
 %preun
+%if 0%{?rhel} == 6
 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 || :
+    /sbin/service openstack-glance-api stop >/dev/null 2>&1
+    /sbin/service openstack-glance-registry stop >/dev/null 2>&1
+    /sbin/service openstack-glance-scrubber stop >/dev/null 2>&1
+
+    /sbin/chkconfig --del openstack-glance-api
+    /sbin/chkconfig --del openstack-glance-registry
+    /sbin/chkconfig --del openstack-glance-scrubber
 fi
+%else
+%systemd_preun openstack-glance-api.service
+%systemd_preun openstack-glance-registry.service
+%systemd_preun openstack-glance-scrubber.service
+%endif
 
 %postun
-/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+%if 0%{?rhel} == 6
 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 || :
+    /sbin/service openstack-glance-api condrestart >/dev/null 2>&1 || :
+    /sbin/service openstack-glance-registry condrestart >/dev/null 2>&1 || :
+    /sbin/service openstack-glance-scrubber condrestart >/dev/null 2>&1 || :
 fi
+%else
+%systemd_postun_with_restart openstack-glance-api.service
+%systemd_postun_with_restart openstack-glance-registry.service
+%systemd_postun_with_restart openstack-glance-scrubber.service
+%endif
 
 %files
 %doc README.rst
@@ -293,9 +353,19 @@ fi
 %{_datadir}/glance/glance-api-dist-paste.ini
 %{_datadir}/glance/glance-registry-dist-paste.ini
 
+%if 0%{?rhel} == 6
+%{_datadir}/glance/openstack-glance-api.upstart
+%{_datadir}/glance/openstack-glance-registry.upstart
+%{_datadir}/glance/openstack-glance-scrubber.upstart
+%{_initrddir}/openstack-glance-api
+%{_initrddir}/openstack-glance-registry
+%{_initrddir}/openstack-glance-scrubber
+%else
 %{_unitdir}/openstack-glance-api.service
 %{_unitdir}/openstack-glance-registry.service
 %{_unitdir}/openstack-glance-scrubber.service
+%endif
+
 %{_mandir}/man1/glance*.1.gz
 %dir %{_sysconfdir}/glance
 %config(noreplace) %attr(-, root, glance) %{_sysconfdir}/glance/glance-api.conf
@@ -319,6 +389,9 @@ fi
 %doc doc/build/html
 
 %changelog
+* Wed Sep 03 2014 Flavio Percoco <flavio at redhat.com> 2014.2-0.3.b2
+- Merge spec from el6-icehouse
+
 * Sat Aug 30 2014 Jon Bernard <jobernar at redhat.com> 2014.2-0.2.b2
 - Fix store disk space exhaustion (CVE-2014-5356)

More information about the scm-commits mailing list