Merge lp:~james-page/keystone/fix-watch-file into lp:~openstack-ubuntu-testing/keystone/raring-grizzly-proposed

[James Page]

Fixup watch file

Fixup watch file

Unmerged revisions

178. By James Page on 2013-03-01

d/watch: Update uversionmangle to deal with upstream versioning
changes, remove tarballs.openstack.org.

177. By Chuck Short on 2013-02-22

releasing version 2013.1.g3-0ubuntu1

176. By Chuck Short on 2013-02-22

* New upstream version.
* debian/control: Add python-oslo-config.

175. By James Page on 2013-02-19

* Refreshed patches.
* d/keystone.template,po: Removed debconf detritus from packaging.

174. By Chuck Short on 2013-02-12

Refresh

173. By Chuck Short on 2013-02-04

debian/patches/sql_connection.patch: Rediffed

172. By Yolanda Robla on 2013-01-22

skip failing tests

171. By Ubuntu <email address hidden> on 2013-01-22

skipped new failing test

170. By Ubuntu <email address hidden> on 2013-01-22

* d/control: Added python-novaclient dependency
* d/patches: refreshed patches

169. By Ubuntu <email address hidden> on 2013-01-22

[ Yolanda Robla Mota ]
d/control: Added python-nova dependency

=== removed directory '.bzr-builddeb'
=== removed file '.bzr-builddeb/default.conf'
--- .bzr-builddeb/default.conf	2012-06-22 16:27:53 +0000
+++ .bzr-builddeb/default.conf	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-[BUILDDEB]
-merge = True

=== modified file 'debian/changelog'
--- debian/changelog	2012-11-15 00:37:06 +0000
+++ debian/changelog	2013-03-01 14:22:25 +0000
@@ -1,4 +1,55 @@
-keystone (2013.1~g1~20121114.2674-0ubuntu1) UNRELEASED; urgency=low
+keystone (2013.1.g3-0ubuntu2) UNRELEASED; urgency=low
+
+  * d/watch: Update uversionmangle to deal with upstream versioning
+    changes, remove tarballs.openstack.org.
+
+ -- James Page <[e-mail]>  Fri, 01 Mar 2013 14:11:04 +0000
+
+keystone (2013.1.g3-0ubuntu1) raring; urgency=low
+
+  [ Chuck Short ]
+  * New upstream version.
+  * debian/patches/sql_connection.patch: Rediffed 
+  * debian/control: Add python-oslo-config.
+
+  [ James Page ]
+  * Refreshed patches.
+  * d/keystone.template,po: Removed debconf detritus from packaging.
+
+ -- Chuck Short <[e-mail]>  Fri, 22 Feb 2013 08:28:35 -0600
+
+keystone (2013.1~g2-0ubuntu1) raring; urgency=low
+
+  [ James Page ]
+  * Re-enable gating of package build based on successful unit testing:
+    - d/tests/test_overrides.conf: Fixup test configuration to use
+      correct certificate locations.
+    - d/p/fix-ubuntu-tests.patch: Skip tests for older versions of 
+      keystoneclient based on checkouts of upstream git repo.
+    - d/rules: Re-enable package build failure on test failure.
+  * d/control: Bump dependencies on python-keystoneclient to >= 1:0.2.
+  * d/control: Update Vcs-Bzr location to point to correct branch.
+  * d/control,d/po/*: Setup package templates for translation.
+  * d/man/*: Corrected spellings in man pages.
+  * d/keystone.upstart: Tweak 'stop on' to be triggered on all
+    appropriate runlevel transitions, use start-stop-daemon to startup
+    keystone daemon.
+
+  [ Adam Gandelman ]
+  * debian/keystone.manpages:  Install sphinx-generated manpages instead
+    of our own outdated and unneeded versions. (LP: #1082050)
+
+  [ Chuck Short ]
+  * New upstream release.
+  * Remove incomplete/broken dbconfig-common scripts.
+
+  [ Yolanda Robla Mota ]
+  * d/control: Added python-novaclient dependency
+  * d/patches: refreshed patches
+
+ -- Yolanda Robla <[e-mail]>  Tue, 22 Jan 2013 12:33:00 +0100
+
+keystone (2013.1~g1-0ubuntu1) raring; urgency=low
 
   [ Adam Gandelman ]
   * debian/tests/test_overrides.conf: Update for Grizzly test suite.
@@ -9,8 +60,9 @@
   * debian/rules: FTBFS if there is a missing binary.
   * debian/rules: Temporarily pass the tests since you need to run
     keystone in order to run the tests.
+  * debian/patches/*: Refrehsed.
 
- -- Adam Gandelman <[e-mail]>  Fri, 02 Nov 2012 11:38:46 +0100
+ -- Chuck Short <[e-mail]>  Fri, 23 Nov 2012 09:01:53 -0600
 
 keystone (2013.1~g1~20121101.2629-0ubuntu1) raring; urgency=low
 

=== modified file 'debian/control'
--- debian/control	2012-11-02 11:59:07 +0000
+++ debian/control	2013-03-01 14:22:25 +0000
@@ -6,17 +6,19 @@
 Uploaders: Soren Hansen <[e-mail]>
 Build-Depends: debhelper (>= 7.0.50),
  pep8,
+ po-debconf,
  pylint,
  python-all (>= 2.6),
  python-all-dev (>= 2.6.6-3~) | python-support,
  python-eventlet,
- python-keystoneclient ( >= 1:0.1.3 ),
+ python-keystoneclient ( >= 1:0.2 ),
  python-ldap,
  python-lxml,
  python-memcache,
  python-migrate,
  python-mox,
  python-nose,
+ python-oslo-config,
  python-pam,
  python-passlib,
  python-paste,
@@ -29,11 +31,12 @@
  python-unittest2,
  python-webob,
  python-webtest,
- python-iso8601
+ python-iso8601,
+ python-novaclient
 Standards-Version: 3.9.3
 XS-Python-Version: >= 2.6
 Homepage: http://launchpad.net/keystone
-Vcs-Bzr: https://code.launchpad.net/~ubuntu-server-dev/keystone/essex
+Vcs-Bzr: https://code.launchpad.net/~openstack-ubuntu-testing/keystone/grizzly
 
 Package: python-keystone
 Architecture: all
@@ -43,6 +46,7 @@
  python-greenlet,
  python-lxml,
  python-migrate,
+ python-oslo-config,
  python-pam,
  python-passlib,
  python-paste,
@@ -52,7 +56,7 @@
  python-sqlalchemy,
  python-migrate,
  python-prettytable,
- python-keystoneclient ( >= 1:0.1.3 ),
+ python-keystoneclient ( >= 1:0.2 ),
  python-webob,
  python-iso8601
 Suggests: python-memcache
@@ -76,8 +80,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.manpages'
--- debian/keystone.manpages	2011-12-15 19:19:30 +0000
+++ debian/keystone.manpages	2013-03-01 14:22:25 +0000
@@ -1,1 +1,1 @@
-debian/man/*
+doc/build/man/*

=== modified file 'debian/keystone.postinst'
--- debian/keystone.postinst	2012-03-01 02:06:30 +0000
+++ debian/keystone.postinst	2013-03-01 14:22:25 +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-03-01 14:22:25 +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#
-

=== removed file 'debian/keystone.templates'
--- debian/keystone.templates	2012-06-22 16:27:53 +0000
+++ debian/keystone.templates	1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-Template: keystone/configure_db
-Type: boolean
-Default: false
-Description: Set up a database for keystone?
- No database has been set up for keystone to use. Before continuing,
- you should make sure you have:
- .
-  - the server host name (that server must allow TCP connections
-    from this machine);
-  - a username and password to access the database.
-  - A database type that you want to use.
- .
- If some of these requirements are missing, reject this option and
- run with regular sqlite support.
- .
- Database configuration can be reconfigured later by running
- 'dpkg-reconfigure -plow keystone'.

=== modified file 'debian/keystone.upstart'
--- debian/keystone.upstart	2012-06-22 16:27:53 +0000
+++ debian/keystone.upstart	2013-03-01 14:22:25 +0000
@@ -2,8 +2,10 @@
 author "Soren Hansen <[e-mail]>"
 
 start on (local-filesystems and net-device-up IFACE!=lo)
-stop on runlevel [016]
+stop on runlevel [!2345]
 
 respawn
 
-exec su -s /bin/sh -c "exec keystone-all" keystone
+exec start-stop-daemon --start --chuid keystone \
+            --chdir /var/lib/keystone --name keystone \
+            --exec /usr/bin/keystone-all

=== removed directory 'debian/man'
=== removed file 'debian/man/keystone-admin.8'
--- debian/man/keystone-admin.8	2012-06-22 16:27:53 +0000
+++ debian/man/keystone-admin.8	1970-01-01 00:00:00 +0000
@@ -1,63 +0,0 @@
-.TH keystone 8
-.SH NAME
-keystone-admin \- provides HTTP for administrators.
-.SH SYNOPSIS
-.I [OPTION]...
-.SH DESCRIPTION
-.BR keystone is a Python implementation of the Openstack
-identity service.
-.TP
-.B --version
-show program's version number and exit
-.TP
-.B \-h, --help
-show help messag and exit
-.TP
-.B \-v, --verbose
-Print more verbose output
-.TP
-.B \-d, --debug
-Prrint debugging output to console.
-.TP
-.B \-c PATH, --config-file=PATH
-Path to the config file to use. When not specified (the default),
-we generally look at the first arguement specified to be a config file,
-and if that is also missing, we search standard directories for a config
-file.
-.TP
-.B \-p BIND_PORT, --port=BIND_PORT, --bind-port=BIND_PORT
-Specifies port to listen on.
-.TP
-.B --host=BIND_HOST, --bind-host=BIND_HOST
-Specifies host address to listen on (default is all or 0.0.0.0)
-.TP 
-.B \-t, --trace-calls
-Turns on call tracing for troubleshooting
-.TP
-.B \-a PORT, --admin-port=PORT
-Specifies port for Admin API to listen on (default is 
-35357)
-.TP
-.B --log-config=PATH
-If this opion is specified, the logging configuration
-file specified is used and overrides any other logging
-options specified. Please see the Python logging
-modules documentation for details on logging 
-confgiuration files.
-.TP
-.B --log-date-format=FORMAT
-Format string for %(asctime)s in log records.
-Default: %Y-%m-%d %H:%M:%S
-.TP
-.B --log-file=PATH
-(Optional) Name of log file to output to. If not set,
-logging will go to stdout.
-.TP
-.B --log-didr=LOG_DIR
-(Optional) The directory to keep log files in (will
-be prepended to --logfile)
-
-.SH FILES
-.IR /etc/keystone/keystone.conf
-.SH AUTHOR
-This manual page was written by Chuck Short <[e-mail]>.

=== removed file 'debian/man/keystone-auth.8'
--- debian/man/keystone-auth.8	2012-06-22 16:27:53 +0000
+++ debian/man/keystone-auth.8	1970-01-01 00:00:00 +0000
@@ -1,63 +0,0 @@
-.TH keystone 8
-.SH NAME
-keystone-auth \- provides HTTP for users.
-.SH SYNOPSIS
-.I [OPTION]...
-.SH DESCRIPTION
-.BR keystone is a Python implementation of the Openstack
-identity service.
-.TP
-.B --version
-show program's version number and exit
-.TP
-.B \-h, --help
-show help messag and exit
-.TP
-.B \-v, --verbose
-Print more verbose output
-.TP
-.B \-d, --debug
-Prrint debugging output to console.
-.TP
-.B \-c PATH, --config-file=PATH
-Path to the config file to use. When not specified (the default),
-we generally look at the first arguement specified to be a config file,
-and if that is also missing, we search standard directories for a config
-file.
-.TP
-.B \-p BIND_PORT, --port=BIND_PORT, --bind-port=BIND_PORT
-Specifies port to listen on.
-.TP
-.B --host=BIND_HOST, --bind-host=BIND_HOST
-Specifies host address to listen on (default is all or 0.0.0.0)
-.TP 
-.B \-t, --trace-calls
-Turns on call tracing for troubleshooting
-.TP
-.B \-a PORT, --admin-port=PORT
-Specifies port for Admin API to listen on (default is 
-35357)
-.TP
-.B --log-config=PATH
-If this opion is specified, the logging configuration
-file specified is used and overrides any other logging
-options specified. Please see the Python logging
-modules documentation for details on logging 
-confgiuration files.
-.TP
-.B --log-date-format=FORMAT
-Format string for %(asctime)s in log records.
-Default: %Y-%m-%d %H:%M:%S
-.TP
-.B --log-file=PATH
-(Optional) Name of log file to output to. If not set,
-logging will go to stdout.
-.TP
-.B --log-didr=LOG_DIR
-(Optional) The directory to keep log files in (will
-be prepended to --logfile)
-
-.SH FILES
-.IR /etc/keystone/keystone.conf
-.SH AUTHOR
-This manual page was written by Chuck Short <[e-mail]>.

=== removed file 'debian/man/keystone-control.8'
--- debian/man/keystone-control.8	2012-06-22 16:27:53 +0000
+++ debian/man/keystone-control.8	1970-01-01 00:00:00 +0000
@@ -1,63 +0,0 @@
-.TH keystone 8
-.SH NAME
-keystone \- Starts/Stops keystone server.
-.SH SYNOPSIS
-.I [OPTION]...
-.SH DESCRIPTION
-.BR keystone is a Python implementation of the Openstack
-identity service.
-.TP
-.B --version
-show program's version number and exit
-.TP
-.B \-h, --help
-show help messag and exit
-.TP
-.B \-v, --verbose
-Print more verbose output
-.TP
-.B \-d, --debug
-Prrint debugging output to console.
-.TP
-.B \-c PATH, --config-file=PATH
-Path to the config file to use. When not specified (the default),
-we generally look at the first arguement specified to be a config file,
-and if that is also missing, we search standard directories for a config
-file.
-.TP
-.B \-p BIND_PORT, --port=BIND_PORT, --bind-port=BIND_PORT
-Specifies port to listen on.
-.TP
-.B --host=BIND_HOST, --bind-host=BIND_HOST
-Specifies host address to listen on (default is all or 0.0.0.0)
-.TP 
-.B \-t, --trace-calls
-Turns on call tracing for troubleshooting
-.TP
-.B \-a PORT, --admin-port=PORT
-Specifies port for Admin API to listen on (default is 
-35357)
-.TP
-.B --log-config=PATH
-If this opion is specified, the logging configuration
-file specified is used and overrides any other logging
-options specified. Please see the Python logging
-modules documentation for details on logging 
-confgiuration files.
-.TP
-.B --log-date-format=FORMAT
-Format string for %(asctime)s in log records.
-Default: %Y-%m-%d %H:%M:%S
-.TP
-.B --log-file=PATH
-(Optional) Name of log file to output to. If not set,
-logging will go to stdout.
-.TP
-.B --log-didr=LOG_DIR
-(Optional) The directory to keep log files in (will
-be prepended to --logfile)
-
-.SH FILES
-.IR /etc/keystone/keystone.conf
-.SH AUTHOR
-This manual page was written by Chuck Short <[e-mail]>.

=== removed file 'debian/man/keystone-import.8'
--- debian/man/keystone-import.8	2012-06-22 16:27:53 +0000
+++ debian/man/keystone-import.8	1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-.TH keystone 8
-.SH NAME
-keystone-import \- import users, tenants, and EC2 credentials from nova.
-.SH SYNOPSIS
-.I [OPTION]...
-.SH DESCRIPTION
-.BR keystone is a Python implementation of the Openstack
-identity service.
-.SH FILES
-.IR /etc/keystone/keystone.conf
-.SH AUTHOR
-This manual page was written by Chuck Short <[e-mail]>.

=== removed file 'debian/man/keystone.8'
--- debian/man/keystone.8	2012-06-22 16:27:53 +0000
+++ debian/man/keystone.8	1970-01-01 00:00:00 +0000
@@ -1,64 +0,0 @@
-.TH keystone 8
-.SH NAME
-keystone \- provides HTTP for administrators and users.
-.SH SYNOPSIS
-.I [OPTION]...
-.SH DESCRIPTION
-.B keystone is a Python implementation of the Openstack
-.B identity service. This version has a lack of SSL support.
-.B It should not be run on a trusted network.
-.TP
-.B --version
-show program's version number and exit
-.TP
-.B \-h, --help
-show help messag and exit
-.TP
-.B \-v, --verbose
-Print more verbose output
-.TP
-.B \-d, --debug
-Prrint debugging output to console.
-.TP
-.B \-c PATH, --config-file=PATH
-Path to the config file to use. When not specified (the default),
-we generally look at the first arguement specified to be a config file,
-and if that is also missing, we search standard directories for a config
-file.
-.TP
-.B \-p BIND_PORT, --port=BIND_PORT, --bind-port=BIND_PORT
-Specifies port to listen on.
-.TP
-.B --host=BIND_HOST, --bind-host=BIND_HOST
-Specifies host address to listen on (default is all or 0.0.0.0)
-.TP 
-.B \-t, --trace-calls
-Turns on call tracing for troubleshooting
-.TP
-.B \-a PORT, --admin-port=PORT
-Specifies port for Admin API to listen on (default is 
-35357)
-.TP
-.B --log-config=PATH
-If this opion is specified, the logging configuration
-file specified is used and overrides any other logging
-options specified. Please see the Python logging
-modules documentation for details on logging 
-confgiuration files.
-.TP
-.B --log-date-format=FORMAT
-Format string for %(asctime)s in log records.
-Default: %Y-%m-%d %H:%M:%S
-.TP
-.B --log-file=PATH
-(Optional) Name of log file to output to. If not set,
-logging will go to stdout.
-.TP
-.B --log-didr=LOG_DIR
-(Optional) The directory to keep log files in (will
-be prepended to --logfile)
-
-.SH FILES
-.IR /etc/keystone/keystone.conf
-.SH AUTHOR
-This manual page was written by Chuck Short <[e-mail]>.

=== modified file 'debian/patches/fix-ubuntu-tests.patch'
--- debian/patches/fix-ubuntu-tests.patch	2012-09-17 14:01:12 +0000
+++ debian/patches/fix-ubuntu-tests.patch	2013-03-01 14:22:25 +0000
@@ -1,185 +1,17 @@
-diff -Naurp keystone-2012.2.orig/tests/test_content_types.py keystone-2012.2/tests/test_content_types.py
---- keystone-2012.2.orig/tests/test_content_types.py	2012-09-14 09:36:08.000000000 -0500
-+++ keystone-2012.2/tests/test_content_types.py	2012-09-17 08:57:18.370256628 -0500
-@@ -105,7 +105,10 @@ class RestfulTestCase(test.TestCase):
- 
-         # Automatically assert HTTP status code
-         if expected_status:
--            self.assertResponseStatus(response, expected_status)
-+            try:
-+                self.assertResponseStatus(response, expected_status)
-+            except:
-+                raise nose.exc.SkipTest('fails on ubuntu buildds')
-         else:
-             self.assertResponseSuccessful(response)
-         self.assertValidResponseHeaders(response)
-@@ -138,11 +141,14 @@ class RestfulTestCase(test.TestCase):
- 
-             >>> self.assertResponseStatus(response, 203)
-         """
--        self.assertEqual(
--            response.status,
--            expected_status,
--            'Status code %s is not %s, as expected)\n\n%s' %
--            (response.status, expected_status, response.body))
-+        try:
-+            self.assertEqual(
-+                response.status,
-+                expected_status,
-+                'Status code %s is not %s, as expected)\n\n%s' %
-+                (response.status, expected_status, response.body))
-+        except:
-+            raise nose.exc.SkipTest('fails on ubuntu buildd')
- 
-     def assertValidResponseHeaders(self, response):
-         """Ensures that response headers appear as expected."""
-@@ -198,7 +204,10 @@ class RestfulTestCase(test.TestCase):
-         body = self._to_content_type(body, headers)
- 
-         # Perform the HTTP request/response
--        response = self.request(headers=headers, body=body, **kwargs)
-+        try:
-+            response = self.request(headers=headers, body=body, **kwargs)
-+        except:
-+            raise nose.exc.SkipTest('fails on buildd')
- 
-         self._from_content_type(response)
- 
-@@ -226,7 +235,10 @@ class RestfulTestCase(test.TestCase):
- 
-     def admin_request(self, port=None, **kwargs):
-         kwargs['port'] = port or self._admin_port()
--        response = self.restful_request(**kwargs)
-+        try:
-+            response = self.restful_request(**kwargs)
-+        except:
-+            raise nose.exc.SkipTest('fails on ubuntu buildds')
-         self.assertValidResponseHeaders(response)
-         return response
- 
-@@ -404,22 +416,28 @@ class CoreApiTests(object):
- 
-         """
-         token = self.get_scoped_token()
--        self.admin_request(
--            method='HEAD',
--            path='/v2.0/tokens/%(token_id)s' % {
--                'token_id': token,
--            },
--            token=token,
--            expected_status=204)
-+        try:
-+            self.admin_request(
-+                method='HEAD',
-+                path='/v2.0/tokens/%(token_id)s' % {
-+                    'token_id': token,
-+                },
-+                token=token,
-+                expected_status=204)
-+        except:
-+            raise nose.exc.SkipTest('fails on ubuntu buildds')
- 
-     def test_endpoints(self):
-         token = self.get_scoped_token()
--        r = self.admin_request(
--            path='/v2.0/tokens/%(token_id)s/endpoints' % {
--                'token_id': token,
--            },
--            token=token)
--        self.assertValidEndpointListResponse(r)
-+        try:
-+            r = self.admin_request(
-+                path='/v2.0/tokens/%(token_id)s/endpoints' % {
-+                    'token_id': token,
-+                },
-+                token=token)
-+            self.assertValidEndpointListResponse(r)
-+        except:
-+            raise nose.exc.SkipTest('failed in ubuntu buildd')
- 
-     def test_get_tenant(self):
-         token = self.get_scoped_token()
-@@ -462,6 +480,7 @@ class CoreApiTests(object):
- 
-     def test_error_response(self):
-         """This triggers assertValidErrorResponse by convention."""
-+        raise nose.exc.SkipTest('Disabled by ubuntu patch')
-         self.public_request(path='/v2.0/tenants', expected_status=401)
- 
- 
-@@ -581,6 +600,8 @@ class JsonTestCase(RestfulTestCase, Core
-         self.assertValidVersion(r.body.get('version'))
- 
-     def assertValidEndpointListResponse(self, r):
-+        raise nose.exc.SkipTest('Skipped by ubuntu packaging')
-+        
-         self.assertIsNotNone(r.body.get('endpoints'))
-         self.assertTrue(len(r.body['endpoints']))
-         for endpoint in r.body['endpoints']:
-@@ -594,6 +615,7 @@ class JsonTestCase(RestfulTestCase, Core
-     def test_service_crud_requires_auth(self):
-         """Service CRUD should 401 without an X-Auth-Token (bug 1006822)."""
-         # values here don't matter because we should 401 before they're checked
-+        raise nose.exc.SkipTest('Skipped by ubuntu packaging')
-         service_path = '/v2.0/OS-KSADM/services/%s' % uuid.uuid4().hex
-         service_body = {
-             'OS-KSADM:service': {
-@@ -626,6 +648,7 @@ class JsonTestCase(RestfulTestCase, Core
-     def test_user_role_list_requires_auth(self):
-         """User role list should 401 without an X-Auth-Token (bug 1006815)."""
-         # values here don't matter because we should 401 before they're checked
-+        raise nose.exc.SkipTest('Skipped by ubuntu packaging')
-         path = '/v2.0/tenants/%(tenant_id)s/users/%(user_id)s/roles' % {
-             'tenant_id': uuid.uuid4().hex,
-             'user_id': uuid.uuid4().hex,
-@@ -635,19 +658,25 @@ class JsonTestCase(RestfulTestCase, Core
-         self.assertValidErrorResponse(r)
- 
-     def test_fetch_revocation_list_nonadmin_fails(self):
--        self.admin_request(
--            method='GET',
--            path='/v2.0/tokens/revoked',
--            expected_status=401)
-+        try:
-+            self.admin_request(
-+                method='GET',
-+                path='/v2.0/tokens/revoked',
-+                expected_status=401)
-+        except:
-+            raise nose.exc.SkipTest('fail in ubuntu buildd')
- 
-     def test_fetch_revocation_list_admin_200(self):
-         token = self.get_scoped_token()
--        r = self.restful_request(
--            method='GET',
--            path='/v2.0/tokens/revoked',
--            token=token,
--            expected_status=200,
--            port=self._admin_port())
-+        try:
-+            r = self.restful_request(
-+                method='GET',
-+                path='/v2.0/tokens/revoked',
-+                token=token,
-+                expected_status=200,
-+                port=self._admin_port())
-+        except:
-+            raise nose.exc.SkipTest('Disabled by ubuntu patch')
-         self.assertValidRevocationListResponse(r)
- 
-     def assertValidRevocationListResponse(self, response):
-@@ -725,6 +754,7 @@ class XmlTestCase(RestfulTestCase, CoreA
-         self.assertValidVersion(xml)
- 
-     def assertValidEndpointListResponse(self, r):
-+        raise nose.exc.SkipTest('Disabled by ubuntu patch')
-         xml = r.body
-         self.assertEqual(xml.tag, self._tag('endpoints'))
- 
-diff -Naurp keystone-2012.2.orig/tests/test_keystoneclient.py keystone-2012.2/tests/test_keystoneclient.py
---- keystone-2012.2.orig/tests/test_keystoneclient.py	2012-09-14 09:36:08.000000000 -0500
-+++ keystone-2012.2/tests/test_keystoneclient.py	2012-09-17 08:14:07.562255462 -0500
-@@ -34,10 +34,6 @@ class CompatTestCase(test.TestCase):
+Description: Fix test execution during package build
+ The keystoneclient testsuite includes a number of tests
+ for older version of keystone which are retrieved from
+ the upstream source repo during testing.
+ .
+ This is not possible during an offline package build so
+ the checkout and tests are disabled/skipped.
+Author: Chuck Short <[e-mail]>
+Author: James Page <[e-mail]>
+Forwarded: not-needed
+
+--- a/tests/test_keystoneclient.py
++++ b/tests/test_keystoneclient.py
+@@ -37,10 +37,6 @@ class CompatTestCase(test.TestCase):
      def setUp(self):
          super(CompatTestCase, self).setUp()
  
@@ -190,51 +22,38 @@
          self.load_backends()
          self.load_fixtures(default_fixtures)
  
-@@ -788,10 +784,8 @@ class KeystoneClientTests(object):
- 
- 
- class KcMasterTestCase(CompatTestCase, KeystoneClientTests):
--    def get_checkout(self):
--        return KEYSTONECLIENT_REPO, 'master'
--
-     def test_tenant_add_and_remove_user(self):
-+        raise nose.exc.SkipTest('Keystoneclient Essex 3 tests disabled.')
-         client = self.get_client(admin=True)
-         client.roles.add_user_role(tenant=self.tenant_baz['id'],
-                                    user=self.user_two['id'],
-@@ -902,6 +896,7 @@ class KcMasterTestCase(CompatTestCase, K
+@@ -918,6 +914,8 @@ class KcMasterTestCase(CompatTestCase, K
                            client.tenants.list, limit=-1)
  
      def test_roles_get_by_user(self):
-+        raise nose.exc.SkipTest('Keystoneclient Essex 3 tests disabled.')
++        raise nose.exc.SkipTest('Disabled by Ubuntu packaging')
++
          client = self.get_client(admin=True)
          roles = client.roles.roles_for_user(user=self.user_foo['id'],
                                              tenant=self.tenant_bar['id'])
-@@ -995,10 +990,8 @@ class KcMasterTestCase(CompatTestCase, K
- 
- 
- class KcEssex3TestCase(CompatTestCase, KeystoneClientTests):
--    def get_checkout(self):
--        return KEYSTONECLIENT_REPO, 'essex-3'
--
+@@ -1015,6 +1013,8 @@ class KcEssex3TestCase(CompatTestCase, K
+         return KEYSTONECLIENT_REPO, 'essex-3'
+ 
      def test_tenant_add_and_remove_user(self):
-+        raise nose.exc.SkipTest('Keystoneclient Essex 3 tests disabled.')
++        raise nose.exc.SkipTest('Disabled by Ubuntu packaging')
++
          client = self.get_client(admin=True)
-         client.roles.add_user_to_tenant(tenant_id=self.tenant_baz['id'],
+         client.roles.add_user_to_tenant(tenant_id=self.tenant_bar['id'],
                                          user_id=self.user_two['id'],
-@@ -1027,6 +1020,7 @@ class KcEssex3TestCase(CompatTestCase, K
+@@ -1043,6 +1043,7 @@ class KcEssex3TestCase(CompatTestCase, K
                       [x.tenantId for x in role_refs])
  
      def test_roles_get_by_user(self):
-+        raise nose.exc.SkipTest('Keystoneclient Essex 3 tests disabled.')
++        raise nose.exc.SkipTest('Disabled by Ubuntu packaging')
          client = self.get_client(admin=True)
          roles = client.roles.get_user_role_refs(user_id='foo')
          self.assertTrue(len(roles) > 0)
-@@ -1038,6 +1032,7 @@ class KcEssex3TestCase(CompatTestCase, K
+@@ -1054,6 +1055,8 @@ class KcEssex3TestCase(CompatTestCase, K
          raise nose.exc.SkipTest('N/A')
  
      def test_user_create_update_delete(self):
-+        raise nose.exc.SkipTest('Keystoneclient Essex 3 tests disabled.')
++        raise nose.exc.SkipTest('Disabled by Ubuntu packaging')
++
          from keystoneclient import exceptions as client_exceptions
  
          test_username = 'new_user'

=== modified file 'debian/patches/sql_connection.patch' (properties changed: +x to -x)
--- debian/patches/sql_connection.patch	2012-09-12 17:30:31 +0000
+++ debian/patches/sql_connection.patch	2013-03-01 14:22:25 +0000
@@ -1,9 +1,7 @@
-Index: keystone-2012.2/etc/keystone.conf.sample
-===================================================================
---- keystone-2012.2.orig/etc/keystone.conf.sample	2012-09-12 10:29:30.239068065 -0700
-+++ keystone-2012.2/etc/keystone.conf.sample	2012-09-12 10:29:58.907069036 -0700
-@@ -23,10 +23,10 @@
- # debug = False
+--- a/etc/keystone.conf.sample
++++ b/etc/keystone.conf.sample
+@@ -44,10 +44,10 @@
+ # verbose = False
  
  # Name of log file to output to. If not set, logging will go to stdout.
 -# log_file = keystone.log
@@ -15,16 +13,7 @@
  
  # Use syslog for logging.
  # use_syslog = False
-@@ -38,7 +38,7 @@
- # used and overrides any other logging options specified. Please see the
- # Python logging module documentation for details on logging configuration
- # files.
--# log_config = logging.conf
-+log_config = /etc/keystone/logging.conf
- 
- # A logging.Formatter log message format string which may use any of the
- # available logging.LogRecord attributes.
-@@ -55,17 +55,17 @@
+@@ -76,13 +76,13 @@
  
  [sql]
  # The SQLAlchemy connection string used to connect to the database
@@ -38,6 +27,10 @@
 -# driver = keystone.identity.backends.sql.Identity
 +driver = keystone.identity.backends.sql.Identity
  
+ # This references the domain to use for all Identity API v2 requests (which are
+ # not aware of domains). A domain with this ID will be created for you by
+@@ -94,7 +94,7 @@
+ 
  [catalog]
  # dynamic, sql-based backend (supports API/CLI-based management commands)
 -# driver = keystone.catalog.backends.sql.Catalog
@@ -45,23 +38,23 @@
  
  # static, file-based backend (does *NOT* support any management commands)
  # driver = keystone.catalog.backends.templated.TemplatedCatalog
-@@ -73,16 +73,16 @@
+@@ -102,16 +102,16 @@
  # template_file = default_catalog.templates
  
  [token]
 -# driver = keystone.token.backends.kvs.Token
-+driver = keystone.token.backends.sql.Token
++driver = keystone.token.backends.kvs.Token
  
  # Amount of time a token should remain valid (in seconds)
  # expiration = 86400
  
  [policy]
--# driver = keystone.policy.backends.rules.Policy
-+driver = keystone.policy.backends.rules.Policy
+-# driver = keystone.policy.backends.sql.Policy
++driver = keystone.policy.backends.sql.Policy
  
  [ec2]
 -# driver = keystone.contrib.ec2.backends.kvs.Ec2
-+driver = keystone.contrib.ec2.backends.sql.Ec2
++driver = keystone.contrib.ec2.backends.kvs.Ec2
  
  [ssl]
  #enable = True

=== modified file 'debian/rules'
--- debian/rules	2012-11-15 00:37:06 +0000
+++ debian/rules	2013-03-01 14:22:25 +0000
@@ -26,7 +26,7 @@
 	cp tests/test_overrides.conf tests/test_overrides.conf.orig
 	cp $(CURDIR)/debian/tests/test_overrides.conf $(CURDIR)/tests/test_overrides.conf
 	sed -i 's|%CUR_DIR%|$(CURDIR)|g' $(CURDIR)/tests/test_overrides.conf
-	PYTHONPATH=$(CURDIR) bash run_tests.sh -N || true
+	PYTHONPATH=$(CURDIR) bash run_tests.sh -N
 	mv $(CURDIR)/tests/test_overrides.conf.orig $(CURDIR)/tests/test_overrides.conf
 	rm -rf $(CURDIR)/debian/tests/testing.db $(CURDIR)/debian/tests/keystone-signing
 endif

=== modified file 'debian/tests/test_overrides.conf'
--- debian/tests/test_overrides.conf	2012-11-02 10:39:19 +0000
+++ debian/tests/test_overrides.conf	2013-03-01 14:22:25 +0000
@@ -13,6 +13,6 @@
 idle_timeout = 200
 
 [signing]
-certfile = signing/signing_cert.pem
-keyfile = signing/private_key.pem
-ca_certs = signing/cacert.pem
+certfile = ../examples/pki/certs/signing_cert.pem
+keyfile = ../examples/pki/private/signing_key.pem
+ca_certs = ../examples/pki/certs/cacert.pem

=== modified file 'debian/watch'
--- debian/watch	2012-08-29 14:13:07 +0000
+++ debian/watch	2013-03-01 14:22:25 +0000
@@ -1,4 +1,4 @@
 version=3
-opts="uversionmangle=s/%7E/~/" https://launchpad.net/keystone/+download https://launchpad.net/keystone/.*/.*/.*/keystone-(.*)\.tar\.gz
-http://tarballs.openstack.org/keystone/ keystone-(\d.*).tar.gz
+opts="uversionmangle=s/\.([a-zA-Z])/~$1/;s/%7E/~/" \
+ https://launchpad.net/keystone/+download https://launchpad.net/keystone/.*/.*/.*/keystone-(.*)\.tar\.gz