Merge lp:~gandelman-a/ubuntu/precise/keystone/lp945299 into lp:~ubuntu-server-dev/keystone/essex

[Adam Gandelman]

[Dave Walker (davewalker)]

Good catch!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-03-02 15:15:20 +0000
+++ debian/changelog	2012-03-03 01:43:17 +0000
@@ -1,3 +1,9 @@
+keystone (2012.1~e4-0ubuntu2) precise; urgency=low
+
+  * debian/keystone.preinst: Create group before creating user (LP: #945299) 
+
+ -- Adam Gandelman <[e-mail]>  Fri, 02 Mar 2012 17:38:00 -0800
+
 keystone (2012.1~e4-0ubuntu1) precise; urgency=low
 
   [ Chuck Short ]

=== modified file 'debian/keystone.preinst'
--- debian/keystone.preinst	2012-03-01 14:30:00 +0000
+++ debian/keystone.preinst	2012-03-03 01:43:17 +0000
@@ -10,6 +10,12 @@
 
 case "$1" in
 	install|upgrade)
+		# create the keystone group
+		if ! getent group keystone > /dev/null 2>&1
+		then
+			addgroup --system keystone >/dev/null || true
+		fi
+
 		# create the keystone user to avoid running keystone as root
 		if ! getent passwd keystone > /dev/null 2>&1
 		then
@@ -27,12 +33,6 @@
 			usermod -g keystone keystone
 		fi
 
-		# create the keystone group
-		if ! getent group keystone > /dev/null 2>&1
-		then
-			addgroup --system keystone >/dev/null || true
-		fi
-
 		# create appropriate directories
     		mkdir -p /var/lib/keystone/ /etc/keystone/ /var/log/keystone/