Merge lp:~zulcss/keystone/keystnoe-g2 into lp:~openstack-ubuntu-testing/keystone/grizzly

[Chuck Short]

keystone g2

[James Page (james-page)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-12-05 19:00:35 +0000
+++ debian/changelog	2013-01-11 15:03:29 +0000
@@ -1,4 +1,4 @@
-keystone (2013.1~g1-0ubuntu3) UNRELEASED; urgency=low
+keystone (2013.1~g2-0ubuntu1) raring; urgency=low
 
   [ James Page ]
   * Re-enable gating of package build based on successful unit testing:
@@ -19,7 +19,11 @@
   * debian/keystone.manpages:  Install sphinx-generated manpages instead
     of our own outdated and unneeded versions. (LP: #1082050)
 
- -- Adam Gandelman <[e-mail]>  Wed, 05 Dec 2012 10:44:19 -0800
+  [ Chuck Short ]
+  * New upstream release.
+  * Remove incomplete/broken dbconfig-common scripts.
+
+ -- Chuck Short <[e-mail]>  Fri, 11 Jan 2013 08:47:26 -0600
 
 keystone (2013.1~g1-0ubuntu1) raring; urgency=low
 

=== modified file 'debian/control'
--- debian/control	2012-11-25 22:38:15 +0000
+++ debian/control	2013-01-11 15:03:29 +0000
@@ -77,8 +77,7 @@
 Depends: ${python:Depends}, ${misc:Depends},
  python-keystone (= ${source:Version}),
  adduser,
- ssl-cert (>= 1.0.12),
- dbconfig-common
+ ssl-cert (>= 1.0.12)
 Description: OpenStack identity service - Daemons
  Keystone is a proposed independent authentication service for OpenStack.
  .

=== removed file 'debian/keystone.config'
--- debian/keystone.config	2012-06-22 16:27:53 +0000
+++ debian/keystone.config	1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
-#!/bin/sh
-set -e
-
-. /usr/share/debconf/confmodule
-
-
-db_input low keystone/configure_db || true
-db_go
-db_get keystone/configure_db
-if [ "$RET" = "true" ]; then
-	if [ -f /usr/share/dbconfig-common/dpkg/config ];
-	then
-		dbc_dbtypes="sqlite3, mysql, pgsql"
-		db_authmethod_user="password"
-		dbc_basepath="/var/lib/keystone"
-		. /usr/share/dbconfig-common/dpkg/config
-		dbc_go keystone $@
-	fi
-fi

=== modified file 'debian/keystone.postinst'
--- debian/keystone.postinst	2012-03-01 02:06:30 +0000
+++ debian/keystone.postinst	2013-01-11 15:03:29 +0000
@@ -2,8 +2,6 @@
 
 set -e
 
-. /usr/share/debconf/confmodule
-. /usr/share/dbconfig-common/dpkg/postinst
 
 # summary of how this script can be called:
 #        * <new-preinst> `install'
@@ -19,30 +17,10 @@
 		#su -s /bin/sh -c 'exec keystone database sync' keystone
 		;;
 	configure)
-		db_get keystone/configure_db
-		if [ "$RET" = "true" ]; then
-			dbc_go keystone $@
-		
-			case "$dbc_dbtype" in
-				sqlite3)
-					SQL_CONNECTION="sqlite:///$dbc_basepath/$dbc_dbname.db"
-					;;
-				mysql)
-					[ -n "$dbc_dbport" ] && dbport=:$dbc_dbport
-					SQL_CONNECTION="mysql://$dbc_dbuser:$dbc_dbpass@${dbc_dbserver:-localhost}$dbport/$dbc_dbname"
-					;;
-				pgsql)
-					[ -n "$dbc_dbport" ] && dbport=:$dbc_dbport
-					SQL_CONNECTION="pgsql://$dbc_dbuser:$dbc_dbpass@${dbc_dbserver:-localhost}$dbport/$dbc_dbname"
-					;;
-				*)
-					SQL_CONNECTION="sqlite:////var/lib/keystone/keystone.db"
-					;;
-			esac
-			[ -z "$2" -o "$dbc_install" = "true" ] \
-				&& sed -e "s,_DBC_URL_,$SQL_CONNECTION," -i /etc/keystone/keystone.conf
+		if ! grep -q sql_connection /etc/keystone/keystone.conf
+        then
+			su -s /bin/sh -c 'exec keystone-manage db_sync' keystone
 		fi
-		su -s /bin/sh -c 'exec keystone-manage db_sync' keystone
 		;;
 	abort-upgrade)
 		echo "aport upgrade called"

=== modified file 'debian/keystone.postrm'
--- debian/keystone.postrm	2012-06-22 16:27:53 +0000
+++ debian/keystone.postrm	2013-01-11 15:03:29 +0000
@@ -2,20 +2,6 @@
 
 set -e
 
-if [ -f /usr/share/debconf/confmodule ]
-then
-    . /usr/share/debconf/confmodule
-fi
-
-if [ -f /etc/dbconfig-common/keystone.conf ] 
-then
-	if [ -f /usr/share/dbconfig-common/dpkg/postrm ]
-	then
-		. /usr/share/dbconfig-common/dpkg/postrm
-		dbc_go keystone $@
-	fi
-fi
-
 case "$1" in
     purge)
         rm -rf /var/log/keystone

=== removed file 'debian/keystone.prerm'
--- debian/keystone.prerm	2012-06-22 16:27:53 +0000
+++ debian/keystone.prerm	1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-set -e
-
-. /usr/share/debconf/confmodule
-. /usr/share/dbconfig-common/dpkg/prerm
-
-
-db_get keystone/configure_db
-if [ "$RET" = "true" ]; then
-	# Only cleanup with dbconfig if it was used during
-	# installation (LP: #948719)
-	dbc_go keystone $@
-fi
-
-#DEBHELPER#
-