From: Thomas Goirand <thomas@goirand.fr>
Date: Sun, 18 Nov 2012 03:24:59 +0000 (+0000)
Subject: * Switched to pkgos_func.
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=70844ed0e793ff6b7c85a23c1f7d54dd7b7101da;p=openstack-build%2Fceilometer-build.git

* Switched to pkgos_func.
* Adds ceilometer user into nova group.

Rewritten-From: 0b26fd03974bb0bb44bac369094c2162466cb503
---

diff --git a/trusty/debian/ceilometer-common.postinst b/trusty/debian/ceilometer-common.postinst
deleted file mode 100644
index e946db0..0000000
--- a/trusty/debian/ceilometer-common.postinst
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ "$1" = "configure" ]; then
-	if ! getenv group ceilometer > /dev/null 2>&1; then
-		addgroup --quiet --system ceilometer >/dev/null
-	fi
-
-	if ! getenv passwd ceilometer > /dev/null 2>&1; then
-		adduser --system \
-			--home /var/lib/ceilometer \
-			--no-create-home \
-			--quiet \
-			--disabled-password \
-			--shell /bin/false \
-			--group ceilometer
-	fi
-
-	chown -R ceilometer:adm /var/log/ceilometer
-	chmod 0750 /var/log/ceilometer
-	chown -R ceilometer:ceilometer /var/lib/ceilometer /etc/ceilometer
-fi
-
-#DEBHELPER#
diff --git a/trusty/debian/ceilometer-common.postinst.in b/trusty/debian/ceilometer-common.postinst.in
new file mode 100644
index 0000000..865d7d5
--- /dev/null
+++ b/trusty/debian/ceilometer-common.postinst.in
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+set -e
+
+#PKGOS-INCLUDE#
+
+if [ "$1" = "configure" ]; then
+	pkgos_var_user_group nova
+	pkgos_var_user_group ceilometer
+	adduser ceilometer nova || true
+fi
+
+#DEBHELPER#
diff --git a/trusty/debian/rules b/trusty/debian/rules
index 1caece1..cc44749 100755
--- a/trusty/debian/rules
+++ b/trusty/debian/rules
@@ -7,10 +7,9 @@ include /usr/share/openstack-pkg-tools/pkgos.make
 %:
 	dh $@  --with python2
 
-DEBVERS := $(shell dpkg-parsechangelog | sed -n -e 's/^Version: //p')
-VERSION := $(shell echo '$(DEBVERS)' | sed -e 's/^[[:digit:]]*://' -e 's/[~-].*//')
-DEBFLAVOR :=$(shell dpkg-parsechangelog | grep -E ^Distribution: | cut -d" " -f2)
-DEBPKGNAME :=$(shell dpkg-parsechangelog | grep -E ^Source: | cut -d" " -f2)
+override_dh_auto_build:
+	dh_auto_build
+	/usr/share/openstack-pkg-tools/pkgos_insert_include pkgos_func ceilometer-common.postinst
 
 override_dh_installchangelogs:
 	dh_installchangelogs debian/CHANGELOG
@@ -18,6 +17,7 @@ override_dh_installchangelogs:
 override_dh_auto_clean:
 	dh_auto_clean
 	rm -rf debian/*.upstart
+	rm -rf debian/ceilometer-common.postinst
 
 override_dh_installinit:
 	if dpkg-vendor --derives-from ubuntu ; then \