Merge lp:~corey.bryant/glance/systemd into lp:~ubuntu-server-dev/glance/kilo

[Corey Bryant]

[lp:~corey.bryant/glance/systemd]

323. By Corey Bryant on 2015-01-13

* Systemd enablement:
  - d/control: Add dh-systemd and openstack-pkg-tools to BD's.
  - d/rules: Enable use of pkgos, tidyup generated init files.
  - d/*.init.in: Cherry pick *.init files from Debian glance package
    and adapt to templates.
  - d/*.upstart: Drop in preference to generated files.
* d/control,compat: Bump debhelper compat level to 9.
* d/*.logrotate,glance-common.logrotate: Move to single logrotate
  configuration.
* d/glance-common.postinst: Use default permissions for /etc/glance.
* d/python-glance-doc.links: Change permissions to 664.

=== modified file 'debian/changelog'
--- debian/changelog	2015-01-05 18:06:12 +0000
+++ debian/changelog	2015-01-13 16:45:09 +0000
@@ -1,3 +1,19 @@
+glance (1:2015.1~b1-0ubuntu2) UNRELEASED; urgency=medium
+
+  * Systemd enablement:
+    - d/control: Add dh-systemd and openstack-pkg-tools to BD's.
+    - d/rules: Enable use of pkgos, tidyup generated init files.
+    - d/*.init.in: Cherry pick *.init files from Debian glance package
+      and adapt to templates.
+    - d/*.upstart: Drop in preference to generated files.
+  * d/control,compat: Bump debhelper compat level to 9.
+  * d/*.logrotate,glance-common.logrotate: Move to single logrotate
+    configuration.
+  * d/glance-common.postinst: Use default permissions for /etc/glance.
+  * d/python-glance-doc.links: Change permissions to 664.
+
+ -- Corey Bryant <[e-mail]>  Thu, 08 Jan 2015 11:08:13 -0500
+
 glance (1:2015.1~b1-0ubuntu1) vivid; urgency=medium
 
   [ Chuck Short ]

=== modified file 'debian/compat'
--- debian/compat	2012-06-22 13:18:10 +0000
+++ debian/compat	2015-01-13 16:45:09 +0000
@@ -1,1 +1,1 @@
-7
+9

=== modified file 'debian/control'
--- debian/control	2014-12-19 21:41:10 +0000
+++ debian/control	2015-01-13 16:45:09 +0000
@@ -2,7 +2,12 @@
 Section: net
 Priority: extra
 Maintainer: Ubuntu OpenStack <[e-mail]>
-Build-Depends: debhelper (>= 7.0.50), python-all (>= 2.6), sqlite3
+Build-Depends:
+ debhelper (>= 9~),
+ dh-systemd,
+ openstack-pkg-tools (>= 21~),
+ python-all (>= 2.6),
+ sqlite3
 Build-Depends-Indep:
  curl,
  python-anyjson (>= 0.3.3),

=== removed file 'debian/glance-api.glance-api.upstart'
--- debian/glance-api.glance-api.upstart	2012-11-26 13:36:21 +0000
+++ debian/glance-api.glance-api.upstart	1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-description "Glance API server"
-author "Soren Hansen <[e-mail]>"
-
-start on runlevel [2345]
-stop on runlevel [!2345]
-
-respawn
-
-exec start-stop-daemon --start --chuid glance \
-            --chdir /var/lib/glance --name glance-api \
-            --exec /usr/bin/glance-api

=== added file 'debian/glance-api.init.in'
--- debian/glance-api.init.in	1970-01-01 00:00:00 +0000
+++ debian/glance-api.init.in	2015-01-13 16:45:09 +0000
@@ -0,0 +1,20 @@
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides:          glance-api
+# Required-Start:    $network $local_fs $remote_fs $syslog
+# Required-Stop:     $remote_fs
+# Should-Start:      postgresql mysql keystone ntp rabbitmq-server
+# Should-Stop:       postgresql mysql keystone ntp rabbitmq-server
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Glance API server
+# Description:       Frontend Glance API server
+### END INIT INFO
+
+# Author: Julien Danjou <[e-mail]>
+
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+DESC="OpenStack Image Service API"
+PROJECT_NAME=glance
+NAME=${PROJECT_NAME}-api
+CONFIG_FILE=/etc/${PROJECT_NAME}/${NAME}.conf

=== removed file 'debian/glance-api.logrotate'
--- debian/glance-api.logrotate	2012-09-12 15:52:59 +0000
+++ debian/glance-api.logrotate	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-/var/log/glance/api.log {
-    daily
-    missingok
-    compress
-    delaycompress
-    notifempty
-}

=== added file 'debian/glance-common.logrotate'
--- debian/glance-common.logrotate	1970-01-01 00:00:00 +0000
+++ debian/glance-common.logrotate	2015-01-13 16:45:09 +0000
@@ -0,0 +1,8 @@
+/var/log/glance/*.log {
+    daily
+    missingok
+    compress
+    delaycompress
+    copytruncate
+    notifempty
+}

=== modified file 'debian/glance-common.postinst'
--- debian/glance-common.postinst	2014-04-14 14:53:23 +0000
+++ debian/glance-common.postinst	2015-01-13 16:45:09 +0000
@@ -15,7 +15,6 @@
 	chown -R glance:adm /var/log/glance
 	chmod 0750 /var/log/glance
 	chown glance:glance -R /etc/glance
-	chmod 0750 /etc/glance
 	find /var/lib/glance -xdev -type d -exec chown glance:glance {} \;
 fi
 

=== removed file 'debian/glance-registry.glance-registry.upstart'
--- debian/glance-registry.glance-registry.upstart	2012-11-26 13:36:21 +0000
+++ debian/glance-registry.glance-registry.upstart	1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-description "Glance registry server"
-author "Soren Hansen <[e-mail]>"
-
-start on runlevel [2345]
-stop on runlevel [!2345]
-
-respawn
-
-exec start-stop-daemon --start --chuid glance \
-            --chdir /var/lib/glance --name glance-registry \
-            --exec /usr/bin/glance-registry

=== added file 'debian/glance-registry.init.in'
--- debian/glance-registry.init.in	1970-01-01 00:00:00 +0000
+++ debian/glance-registry.init.in	2015-01-13 16:45:09 +0000
@@ -0,0 +1,20 @@
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides:          glance-registry
+# Required-Start:    $network $local_fs $remote_fs $syslog
+# Required-Stop:     $remote_fs
+# Should-Start:      postgresql mysql keystone ntp rabbitmq-server
+# Should-Stop:       postgresql mysql keystone ntp rabbitmq-server
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Glance registry server
+# Description:       Frontend Glance registry server
+### END INIT INFO
+
+# Author: Julien Danjou <[e-mail]>
+
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+DESC="OpenStack Image Service Registry"
+PROJECT_NAME=glance
+NAME=${PROJECT_NAME}-registry
+CONFIG_FILE=/etc/${PROJECT_NAME}/${NAME}.conf

=== removed file 'debian/glance-registry.logrotate'
--- debian/glance-registry.logrotate	2012-09-12 15:52:59 +0000
+++ debian/glance-registry.logrotate	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-/var/log/glance/registry.log {
-    daily
-    missingok
-    compress
-    delaycompress
-    notifempty
-}

=== modified file 'debian/python-glance-doc.links' (properties changed: +x to -x)
=== modified file 'debian/rules'
--- debian/rules	2014-10-03 11:06:47 +0000
+++ debian/rules	2015-01-13 16:45:09 +0000
@@ -7,8 +7,10 @@
 VERSION ?= $(shell echo '$(DEBVERS)' | sed -e 's/^[[:digit:]]*://' -e 's/[-].*//')
 export OSLO_PACKAGE_VERSION=$(VERSION)
 
+include /usr/share/openstack-pkg-tools/pkgos.make
+
 %:
-	dh $@ --with python2
+	dh $@ --with python2,systemd
 
 get-orig-source:
 	uscan --verbose --force-download --rename --destdir=../build-area
@@ -39,7 +41,4 @@
 	dh_auto_clean
 	rm -rf doc/build
 	rm -rf glance.sqlite
-
-override_dh_installinit:
-	dh_installinit --name glance-api
-	dh_installinit --name glance-registry
+	rm -f debian/*.init debian/*.service debian/*.upstart