Merge lp:~salgado/launchpad/remove-auth-store into lp:launchpad/db-devel

[Guilherme Salgado]

Remove the auth store, together with c-i-p.

Had to grant some extra DB permissions on security.cfg because some
things that used to be done using the launchpad_auth user (the one
always used for the auth store, regardless of what was given to
initZopeless) are now done using whichever user is used by the
script/test.

 reviewer stub

--
Guilherme Salgado <email address hidden>

[Stuart Bishop (stub)]

On Wed, Mar 31, 2010 at 2:00 AM, Guilherme Salgado
<email address hidden> wrote:

> Remove the auth store, together with c-i-p.
>
> Had to grant some extra DB permissions on security.cfg because some
> things that used to be done using the launchpad_auth user (the one
> always used for the auth store, regardless of what was given to
> initZopeless) are now done using whichever user is used by the
> script/test.

Yay. This is more than I expected.

> === modified file 'lib/canonical/launchpad/database/tests/test_oauth.py'
> --- lib/canonical/launchpad/database/tests/test_oauth.py 2009-06-25 05:30:52 +0000
> +++ lib/canonical/launchpad/database/tests/test_oauth.py 2010-03-30 19:00:44 +0000
> @@ -22,7 +22,7 @@
> """Base tests for the OAuth database classes."""
> layer = DatabaseFunctionalLayer
>
> - def test__get_store_should_return_the_auth_master_store(self):
> + def test__get_store_should_return_the_main_master_store(self):
> """We want all OAuth classes to use the master store.
> Otherwise, the OAuth exchanges will fail because the authorize
> screen won't probably find the new request token on the slave store.

Does this test serve any purpose any more? Maybe remove it entirely.

> === modified file 'lib/canonical/launchpad/webapp/adapter.py'
> try:
> + # XXX: Salgado, 2010-03-22: We can get rid of the realm now that
> + # the auth DB is gone, but I'm not doing it in this branch to keep
> + # the diff simple.
> config_section, realm, flavor = self._uri.database.split('-')
> except ValueError:
> raise AssertionError(
> 'Connection uri %s does not match section-realm-flavor format'
> % repr(self._uri.database))

I don't think this XXX is warranted. We may well have more realms in
the future, for example if we move translations or codehosting to
their own database for scalability reasons.

> === modified file 'lib/canonical/launchpad/webapp/ftests/test_adapter_permissions.txt'
> -
> -A MASTER_FLAVOR Store does not allow writes to tables outside of that
> -Store's replication set.
> -
> - >>> t = transaction.begin()
> - >>> person = main_master.find(Person, name='no-priv').one()
> - >>> account = person.account
> - >>> account.displayname = "Ben Dover"
> - >>> main_master.flush()
> - Traceback (most recent call last):
> - ...
> - ProgrammingError: permission denied for relation account
> - >>> transaction.abort()
> -
> - >>> t = transaction.begin()
> - >>> auth_master = getUtility(IStoreSelector).get(AUTH_STORE, MASTER_FLAVOR)
> - >>> person = auth_master.find(Person, name='no-priv').one()
> - >>> account = person.account
> - >>> account.displayname = "Ben Dover"
> - >>> auth_master.flush()
> - >>> transaction.abort()

But this crap can certainly go. If we split the database in the
future, there will be no crossover. What I've learned from the
authdb/lpmain split is that the split needs to be clean, or we end up
with confusing code (is my email address from the authdb Store or the
lpmain Store) and a complicated and tricky to maintain repl...

review: Approve

[Guilherme Salgado (salgado)]

On Thu, 2010-04-01 at 15:12 +0000, Stuart Bishop wrote:
> Review: Approve
> On Wed, Mar 31, 2010 at 2:00 AM, Guilherme Salgado
> <email address hidden> wrote:
>
> > Remove the auth store, together with c-i-p.
> >
> > Had to grant some extra DB permissions on security.cfg because some
> > things that used to be done using the launchpad_auth user (the one
> > always used for the auth store, regardless of what was given to
> > initZopeless) are now done using whichever user is used by the
> > script/test.
>
> Yay. This is more than I expected.

More than I expected too. :/

And to make things worse, there are a couple extra revisions that
weren't in the diff you reviewed (I'm assuming you reviewed the diff
that was sent out when the m-p was created):

http://bazaar.launchpad.net/~salgado/launchpad/remove-auth-store/revision/10563
http://bazaar.launchpad.net/~salgado/launchpad/remove-auth-store/revision/10564

They're trivial, though.

>
>
>
> > === modified file 'lib/canonical/launchpad/database/tests/test_oauth.py'
> > --- lib/canonical/launchpad/database/tests/test_oauth.py 2009-06-25 05:30:52 +0000
> > +++ lib/canonical/launchpad/database/tests/test_oauth.py 2010-03-30 19:00:44 +0000
> > @@ -22,7 +22,7 @@
> > """Base tests for the OAuth database classes."""
> > layer = DatabaseFunctionalLayer
> >
> > - def test__get_store_should_return_the_auth_master_store(self):
> > + def test__get_store_should_return_the_main_master_store(self):
> > """We want all OAuth classes to use the master store.
> > Otherwise, the OAuth exchanges will fail because the authorize
> > screen won't probably find the new request token on the slave store.
>
> Does this test serve any purpose any more? Maybe remove it entirely.
>

AIUI, it's necessary because we want to make sure that we use the master
store (by default) when dealing with OAuth-related objects. (The name
of the test method was actually wrong; this is not related to the other
changes on this branch)

>
> > === modified file 'lib/canonical/launchpad/webapp/adapter.py'
> > try:
> > + # XXX: Salgado, 2010-03-22: We can get rid of the realm now that
> > + # the auth DB is gone, but I'm not doing it in this branch to keep
> > + # the diff simple.
> > config_section, realm, flavor = self._uri.database.split('-')
> > except ValueError:
> > raise AssertionError(
> > 'Connection uri %s does not match section-realm-flavor format'
> > % repr(self._uri.database))
>
> I don't think this XXX is warranted. We may well have more realms in
> the future, for example if we move translations or codehosting to
> their own database for scalability reasons.

Fair enough; I thought we'd remove that because I had never heard of
these plans.

>
> > === modified file 'lib/canonical/launchpad/webapp/ftests/test_adapter_permissions.txt'
> > -
> > -A MASTER_FLAVOR Store does not allow writes to tables outside of that
> > -Store's replication set.
> > -
> > - >>> t = transaction.begin()
> > - >>> person = main_master.find(Person, name='no-priv').one()
> > - >>> a...

=== modified file 'configs/development/launchpad-lazr.conf'
--- configs/development/launchpad-lazr.conf	2010-03-05 20:49:31 +0000
+++ configs/development/launchpad-lazr.conf	2010-04-05 12:47:32 +0000
@@ -97,8 +97,6 @@
 # the rw_* configs.
 ro_main_master: dbname=launchpad_dev_template
 ro_main_slave:  dbname=launchpad_dev_template
-auth_master: dbname=launchpad_dev
-auth_slave:  dbname=launchpad_dev
 
 [distributionmirrorprober]
 use_proxy: False

=== modified file 'configs/replicated-development/launchpad-lazr.conf'
--- configs/replicated-development/launchpad-lazr.conf	2010-01-05 19:09:58 +0000
+++ configs/replicated-development/launchpad-lazr.conf	2010-04-05 12:47:32 +0000
@@ -10,6 +10,3 @@
 rw_main_slave: dbname=launchpad_dev_slave
 ro_main_master: dbname=launchpad_dev
 ro_main_slave: dbname=launchpad_dev_slave
-auth_master: dbname=launchpad_dev
-auth_slave: dbname=launchpad_dev_slave
-

=== modified file 'configs/test-playground/launchpad-lazr.conf'
--- configs/test-playground/launchpad-lazr.conf	2010-01-05 19:09:58 +0000
+++ configs/test-playground/launchpad-lazr.conf	2010-04-05 12:47:32 +0000
@@ -10,5 +10,3 @@
 rw_main_slave:  dbname=launchpad_ftest_playground
 ro_main_master: dbname=launchpad_ftest_playground
 ro_main_slave:  dbname=launchpad_ftest_playground
-auth_master: dbname=launchpad_ftest_playground
-auth_slave:  dbname=launchpad_ftest_playground

=== modified file 'configs/testrunner/launchpad-lazr.conf'
--- configs/testrunner/launchpad-lazr.conf	2010-03-11 01:39:25 +0000
+++ configs/testrunner/launchpad-lazr.conf	2010-04-05 12:47:32 +0000
@@ -51,8 +51,6 @@
 # the rw_* configs.
 ro_main_master: dbname=launchpad_ftest_template
 ro_main_slave:  dbname=launchpad_ftest_template
-auth_master: dbname=launchpad_ftest
-auth_slave:  dbname=launchpad_ftest
 randomise_select_results: true
 
 [error_reports]

=== modified file 'database/schema/security.cfg'
--- database/schema/security.cfg	2010-04-02 17:29:13 +0000
+++ database/schema/security.cfg	2010-04-05 12:47:32 +0000
@@ -118,7 +118,8 @@
 # lpmain replication set access from the main Z3 application.
 type=user
 groups=write,script
-public.account                          = SELECT
+public.account                          = SELECT, INSERT, UPDATE, DELETE
+public.accountpassword                  = SELECT, INSERT, UPDATE, DELETE
 public.announcement                     = SELECT, INSERT, UPDATE, DELETE
 public.answercontact                    = SELECT, INSERT, UPDATE, DELETE
 public.apportjob                        = SELECT, INSERT, UPDATE, DELETE
@@ -176,7 +177,7 @@
 public.distributionsourcepackagecache   = SELECT
 public.distroserieslanguage             = SELECT, INSERT, UPDATE
 public.distroseriespackagecache         = SELECT
-public.emailaddress                     = SELECT
+public.emailaddress                     = SELECT, INSERT, UPDATE, DELETE
 public.entitlement                      = SELECT, INSERT, UPDATE, DELETE
 public.faq                              = SELECT, INSERT, UPDATE, DELETE
 public.featuredproject                  = SELECT, INSERT, DELETE
@@ -916,6 +917,8 @@
 # Full access except for tables that are exclusively updated by
 # certain processes, such as the librarian tables. This group is deprecated -
 # access should be explicitly granted to users.
+public.account                          = SELECT, INSERT, UPDATE
+public.accountpassword                  = SELECT, INSERT
 public.archive                          = SELECT, INSERT, UPDATE
 public.archivearch                      = SELECT, INSERT, UPDATE, DELETE
 public.binarypackagerelease             = SELECT, INSERT, UPDATE
@@ -949,6 +952,7 @@
 public.distribution                     = SELECT, INSERT, UPDATE
 public.distroarchseries                 = SELECT, INSERT, UPDATE
 public.distroseries                     = SELECT, INSERT, UPDATE
+public.openidrpsummary                  = SELECT, INSERT, UPDATE
 public.packageupload                    = SELECT, INSERT, UPDATE
 public.packageuploadbuild               = SELECT, INSERT, UPDATE
 public.packageuploadsource              = SELECT, INSERT, UPDATE

=== modified file 'lib/canonical/buildd/debian/control'
--- lib/canonical/buildd/debian/control	2009-11-17 22:28:43 +0000
+++ lib/canonical/buildd/debian/control	2010-04-05 12:47:32 +0000
@@ -8,7 +8,7 @@
 Package: launchpad-buildd
 Section: misc
 Architecture: all
-Depends: python-twisted, debootstrap, dpkg-dev, linux32, file, bzip2, sudo, ntpdate, adduser, apt-transport-https
+Depends: python-twisted-core, python-twisted-web, debootstrap, dpkg-dev, linux32, file, bzip2, sudo, ntpdate, adduser, apt-transport-https
 Description: Launchpad buildd slave
  This is the launchpad buildd slave package. It contains everything needed to
  get a launchpad buildd going apart from the database manipulation required to

=== modified file 'lib/canonical/config/__init__.py'
--- lib/canonical/config/__init__.py	2010-01-14 16:39:18 +0000
+++ lib/canonical/config/__init__.py	2010-04-05 12:47:32 +0000
@@ -374,13 +374,13 @@
     _db_config_attrs = frozenset([
         'dbuser', 'auth_dbuser',
         'rw_main_master', 'rw_main_slave',
-        'ro_main_master', 'ro_main_slave', 'auth_master', 'auth_slave',
+        'ro_main_master', 'ro_main_slave',
         'db_statement_timeout', 'db_statement_timeout_precision',
         'isolation_level', 'randomise_select_results',
         'soft_request_timeout', 'storm_cache', 'storm_cache_size'])
     _db_config_required_attrs = frozenset([
         'dbuser', 'rw_main_master', 'rw_main_slave', 'ro_main_master',
-        'ro_main_slave', 'auth_master', 'auth_slave'])
+        'ro_main_slave'])
 
     @property
     def main_master(self):

=== modified file 'lib/canonical/config/schema-lazr.conf'
--- lib/canonical/config/schema-lazr.conf	2010-03-24 02:37:55 +0000
+++ lib/canonical/config/schema-lazr.conf	2010-04-05 12:47:32 +0000
@@ -559,8 +559,6 @@
 rw_main_slave:  dbname=launchpad_prod_2 host=chokecherry.canonical.com
 ro_main_master: dbname=launchpad_standalone_1 host=chokecherry.canonical.com
 ro_main_slave:  dbname=launchpad_standalone_1 host=chokecherry.canonical.com
-auth_master: dbname=launchpad_prod_3 host=wildcherry.canonical.com
-auth_slave:  dbname=launchpad_prod_2 host=chokecherry.canonical.com
 
 # If the replication lag is more than this many seconds, slave databases
 # will not be used.
@@ -867,16 +865,10 @@
 # datatype: integer
 max_scaling: 500
 
-[sso]
-dbuser: sso_main
-auth_dbuser: sso_auth
-
-
 [launchpad]
 # The database user which will be used by this process.
 # datatype: string
 dbuser: launchpad_main
-auth_dbuser: launchpad_auth
 storm_cache: generational
 storm_cache_size: 10000
 

=== modified file 'lib/canonical/configure.zcml'
--- lib/canonical/configure.zcml	2010-01-08 21:23:15 +0000
+++ lib/canonical/configure.zcml	2010-04-05 12:47:32 +0000
@@ -154,7 +154,5 @@
     <include package="canonical.lazr" />
     <include zcml:condition="installed canonical.shipit"
              package="canonical.shipit" />
-    <include zcml:condition="installed canonical.signon"
-             package="canonical.signon" />
 
 </configure>

=== modified file 'lib/canonical/database/harness.py'
--- lib/canonical/database/harness.py	2009-11-05 03:52:51 +0000
+++ lib/canonical/database/harness.py	2010-04-05 12:47:32 +0000
@@ -48,8 +48,7 @@
 from storm.locals import *
 from storm.expr import *
 from canonical.launchpad.webapp.interfaces import (
-        IStoreSelector, MAIN_STORE, AUTH_STORE, MASTER_FLAVOR,
-        SLAVE_FLAVOR, DEFAULT_FLAVOR)
+    IStoreSelector, MAIN_STORE, MASTER_FLAVOR, SLAVE_FLAVOR, DEFAULT_FLAVOR)
 
 
 def switch_db_user(dbuser, commit_first=True):

=== modified file 'lib/canonical/database/sqlbase.py'
--- lib/canonical/database/sqlbase.py	2010-03-23 15:04:41 +0000
+++ lib/canonical/database/sqlbase.py	2010-04-05 12:47:32 +0000
@@ -271,7 +271,6 @@
         # This is only used by scripts, so we must connect to the read-write
         # DB here -- that's why we use rw_main_master directly.
         main_connection_string = dbconfig.rw_main_master
-        auth_connection_string = dbconfig.auth_master
 
         # Override dbname and dbhost in the connection string if they
         # have been passed in.
@@ -290,7 +289,7 @@
             match = re.search(r'host=(\S*)', main_connection_string)
             if match is not None:
                 dbhost = match.group(1)
-        return main_connection_string, auth_connection_string, dbname, dbhost
+        return main_connection_string, dbname, dbhost
 
     @classmethod
     def initZopeless(cls, dbname=None, dbhost=None, dbuser=None,
@@ -298,7 +297,7 @@
         # Connect to the auth master store as well, as some scripts might need
         # to create EmailAddresses and Accounts.
 
-        main_connection_string, auth_connection_string, dbname, dbhost = (
+        main_connection_string, dbname, dbhost = (
             cls._get_zopeless_connection_config(dbname, dbhost))
 
         assert dbuser is not None, '''
@@ -315,7 +314,6 @@
         overlay = dedent("""\
             [database]
             rw_main_master: %(main_connection_string)s
-            auth_master: %(auth_connection_string)s
             isolation_level: %(isolation_level)s
             """ % vars())
 

=== modified file 'lib/canonical/database/tests/test_zopeless_transaction_manager.py'
--- lib/canonical/database/tests/test_zopeless_transaction_manager.py	2009-12-14 17:38:34 +0000
+++ lib/canonical/database/tests/test_zopeless_transaction_manager.py	2010-04-05 12:47:32 +0000
@@ -1,48 +1,17 @@
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
-from textwrap import dedent
 import unittest
 
 from zope.component import getUtility
 
 from storm.zope.interfaces import IZStorm
 
-from canonical.config import config
 from canonical.database.sqlbase import ZopelessTransactionManager
 from canonical.testing.layers import LaunchpadZopelessLayer
 from lp.testing import TestCase
 
 
-class TestZopelessTransactionManagerNoLayer(TestCase):
-
-    def test_initZopeless_connects_to_auth_master_db(self):
-        # Some scripts might create EmailAddress and Account entries, so
-        # initZopeless has to connect to the auth master db.  This is a
-        # bugfix test.  The error that this test detects is that the
-        # script used to use the main_master database for the
-        # auth_master.  In this test, we make sure that the auth_master
-        # and main_master have different values in the config, and then
-        # show that they are honored.  Prior to the fix, ``auth_master``
-        # would have been changed to the same value as ``main_master``.
-        # Now we set up our test data and push it on the config.
-        auth_master = "dbname=example_launchpad_auth_does_not_exist"
-        overlay = dedent("""
-            [database]
-            main_master: dbname=launchpad_dev
-            auth_master: %s
-            """ % (auth_master,))
-        config.push('new-db', overlay)
-        try:
-            main_connection_string, auth_connection_string, dbname, dbhost = (
-                ZopelessTransactionManager._get_zopeless_connection_config(
-                    None, None))
-            self.assertEqual(auth_connection_string, auth_master)
-        finally:
-            # Clean up the configuration
-            config.pop('new-db')
-
-
 class TestZopelessTransactionManager(TestCase):
     layer = LaunchpadZopelessLayer
 

=== modified file 'lib/canonical/launchpad/database/tests/test_oauth.py'
--- lib/canonical/launchpad/database/tests/test_oauth.py	2009-06-25 05:30:52 +0000
+++ lib/canonical/launchpad/database/tests/test_oauth.py	2010-04-05 12:47:32 +0000
@@ -22,7 +22,7 @@
     """Base tests for the OAuth database classes."""
     layer = DatabaseFunctionalLayer
 
-    def test__get_store_should_return_the_auth_master_store(self):
+    def test__get_store_should_return_the_main_master_store(self):
         """We want all OAuth classes to use the master store.
         Otherwise, the OAuth exchanges will fail because the authorize
         screen won't probably find the new request token on the slave store.

=== modified file 'lib/canonical/launchpad/doc/account.txt'
--- lib/canonical/launchpad/doc/account.txt	2010-02-12 15:57:27 +0000
+++ lib/canonical/launchpad/doc/account.txt	2010-04-05 12:47:32 +0000
@@ -196,32 +196,6 @@
     >>> account.status = AccountStatus.ACTIVE
     >>> login('[e-mail]')
 
-The Account's displayname is synced to the Person's displayname if there
-is one. If the Person.displayname is changed, the Account.displayname is
-changed too.
-
-    >>> from canonical.launchpad.interfaces import IPersonSet
-
-    >>> personset = getUtility(IPersonSet)
-    >>> person = personset.getByEmail('[e-mail]')
-    >>> person.displayname = 'Something New'
-    >>> print account.displayname
-    Something New
-
-However, the reverse is not true. If we change the Account.displayname,
-the linked Person.displayname (if there is one) is not updated
-immediately.  Instead, a cron job will sync this information later. This
-allows displayname changes to happen even when the Person table is
-unavailable.
-
-    >>> account.displayname = 'No Privileges Account'
-    >>> print person.displayname
-    Something New
-
-    >>> person.displayname = 'No Privileges Person'
-    >>> print account.displayname
-    No Privileges Person
-
 An Account has an OpenID identifier used to generate the OpenID identity
 URL.
 
@@ -242,6 +216,7 @@
     >>> login('[e-mail]')
     >>> passwordless_account = account_set.new(
     ...     AccountCreationRationale.USER_CREATED, 'Passwordless')
+    >>> transaction.commit()
     >>> print passwordless_account.creation_rationale.name
     USER_CREATED
     >>> print passwordless_account.displayname

=== modified file 'lib/canonical/launchpad/doc/storm.txt'
--- lib/canonical/launchpad/doc/storm.txt	2010-02-22 10:33:10 +0000
+++ lib/canonical/launchpad/doc/storm.txt	2010-04-05 12:47:32 +0000
@@ -7,10 +7,11 @@
 specific Storm tools to cope with our master and slave store arrangement.
 
     >>> from canonical.launchpad.interfaces import (
-    ...     EmailAddressStatus, IAccountSet, IEmailAddressSet,
+    ...     EmailAddressStatus, IEmailAddressSet,
     ...     IMasterObject, IMasterStore, ISlaveStore, IStore)
     >>> from canonical.launchpad.database import (
     ...     Account, AccountPassword, EmailAddress)
+    >>> from lp.registry.interfaces.person import IPersonSet
     >>> from lp.registry.model.person import Person
     >>> from zope.security.proxy import ProxyFactory
 
@@ -19,30 +20,14 @@
 a Launchpad database object. You can use adapters to
 retrieve the correct Store.
 
-    >>> auth_master = IMasterStore(Account)
     >>> main_master = IMasterStore(Person)
-    >>> auth_master is main_master
-    False
-
-
-You can read most tables from any Store, which is required for doing
-fast joins in the database. However, when it is not necessary to
-retrieve objects from the same store as another object, it is better to
-explicitly use the explicit Store for its replication set. Some tables
-are only available from this store, such as the AccountPassword table.
-
-    >>> auth_slave = ISlaveStore(AccountPassword)
-    >>> main_slave = ISlaveStore(Person)
-    >>> auth_slave is main_slave
-    False
-
 
 You can detect if a store is writable by checking what interfaces it
 provides.
 
-    >>> IMasterStore.providedBy(auth_master)
+    >>> IMasterStore.providedBy(main_master)
     True
-    >>> ISlaveStore.providedBy(auth_master)
+    >>> ISlaveStore.providedBy(main_master)
     False
 
 
@@ -53,7 +38,6 @@
 Otherwise, it gives you the master. See IStoreSelector for details.
 
     >>> main_default = IStore(Person)
-    >>> main_master = IMasterStore(Person)
     >>> main_slave = ISlaveStore(Person)
     >>> main_default is main_master
     True
@@ -78,11 +62,10 @@
 changes to an object, just in case you have been passed an instance
 from a store other than the correct Master.
 
-    >>> auth_slave = ISlaveStore(Account)
+    >>> main_slave = ISlaveStore(Person)
     >>> t = transaction.begin()
-    >>> account = auth_slave.find(
-    ...     Account, openid_identifier='mark_oid').one()
-    >>> account.displayname = 'Cannot change'
+    >>> person = main_slave.find(Person, name='mark').one()
+    >>> person.displayname = 'Cannot change'
     >>> transaction.commit()
     Traceback (most recent call last):
     ...
@@ -90,9 +73,8 @@
 
     >>> transaction.abort()
     >>> t = transaction.begin()
-    >>> account = auth_slave.find(
-    ...     Account, openid_identifier='mark_oid').one()
-    >>> IMasterObject(account).displayname = 'Can change'
+    >>> person = main_slave.find(Person, name='mark').one()
+    >>> IMasterObject(person).displayname = 'Can change'
     >>> transaction.commit()
 
 
@@ -100,61 +82,60 @@
 similarly wrapped.
 
     >>> from zope.security.proxy import removeSecurityProxy
-    >>> account = getUtility(IAccountSet).getByEmail('[e-mail]')
-    >>> removeSecurityProxy(account) is account
-    False
-    >>> account.displayname
-    u'No Privileges Person'
-    >>> account.password
-    Traceback (most recent call last):
-    ...
-    Unauthorized: ...
-
-    >>> account = IMasterObject(account)
-    >>> removeSecurityProxy(account) is account
-    False
-    >>> account.displayname
-    u'No Privileges Person'
-    >>> account.password
-    Traceback (most recent call last):
-    ...
-    Unauthorized: ...
-
-    >>> account = IMasterObject(removeSecurityProxy(account))
-    >>> removeSecurityProxy(account) is account
+    >>> person = getUtility(IPersonSet).getByEmail('[e-mail]')
+    >>> removeSecurityProxy(person) is person
+    False
+    >>> person.displayname
+    u'No Privileges Person'
+    >>> person.name = 'foo'
+    Traceback (most recent call last):
+    ...
+    Unauthorized: ...
+
+    >>> person = IMasterObject(person)
+    >>> removeSecurityProxy(person) is person
+    False
+    >>> person.displayname
+    u'No Privileges Person'
+    >>> person.name = 'foo'
+    Traceback (most recent call last):
+    ...
+    Unauthorized: ...
+
+    >>> person = IMasterObject(removeSecurityProxy(person))
+    >>> removeSecurityProxy(person) is person
     True
-    >>> account.displayname
+    >>> person.displayname
     u'No Privileges Person'
-    >>> account.password
-    u'...'
+    >>> person.name = 'foo'
 
 Our objects may compare equal even if they have come from different
 stores.
 
-    >>> auth_master_email = IMasterStore(EmailAddress).find(
-    ...     EmailAddress, Person.name == 'janitor',
-    ...     EmailAddress.person==Person.id).one()
-    >>> auth_slave_email = ISlaveStore(EmailAddress).find(
-    ...     EmailAddress, Person.name == 'janitor',
-    ...     EmailAddress.person==Person.id).one()
-    >>> auth_master_email is auth_slave_email
+    >>> master_email = IMasterStore(EmailAddress).find(
+    ...     EmailAddress, Person.name == 'janitor',
+    ...     EmailAddress.person==Person.id).one()
+    >>> slave_email = ISlaveStore(EmailAddress).find(
+    ...     EmailAddress, Person.name == 'janitor',
+    ...     EmailAddress.person==Person.id).one()
+    >>> master_email is slave_email
     False
-    >>> auth_master_email == auth_slave_email
+    >>> master_email == slave_email
     True
-    >>> auth_master_email != auth_slave_email
+    >>> master_email != slave_email
     False
 
 Comparison works for security wrapped objects too.
 
     >>> wrapped_email = getUtility(IEmailAddressSet).getByEmail(
-    ...     auth_master_email.email)
-    >>> removeSecurityProxy(wrapped_email) is auth_master_email
+    ...     master_email.email)
+    >>> removeSecurityProxy(wrapped_email) is master_email
     True
-    >>> wrapped_email is auth_master_email
+    >>> wrapped_email is master_email
     False
-    >>> wrapped_email == auth_master_email
+    >>> wrapped_email == master_email
     True
-    >>> wrapped_email != auth_master_email
+    >>> wrapped_email != master_email
     False
 
 Objects not yet flushed to the database also compare equal.
@@ -176,10 +157,9 @@
 
 Objects differing by class never compare equal.
 
-    >>> account_one = IMasterStore(Account).get(Account, 1)
-    >>> person_one = IMasterStore(Account).get(Person, 1)
-    >>> account_one == person_one
+    >>> email_one = IMasterStore(EmailAddress).get(EmailAddress, 1)
+    >>> person_one = IMasterStore(Person).get(Person, 1)
+    >>> email_one == person_one
     False
-    >>> account_one != person_one
+    >>> email_one != person_one
     True
-

=== modified file 'lib/canonical/launchpad/pagetests/standalone/xx-opstats.txt'
--- lib/canonical/launchpad/pagetests/standalone/xx-opstats.txt	2010-01-13 13:50:39 +0000
+++ lib/canonical/launchpad/pagetests/standalone/xx-opstats.txt	2010-04-05 12:47:32 +0000
@@ -236,8 +236,6 @@
     ...     [database]
     ...     rw_main_master: dbname=nonexistant
     ...     rw_main_slave: dbname=nonexistant
-    ...     auth_master: dbname=nonexistant
-    ...     auth_slave: dbname=nonexistant
     ...
     ...     [launchpad_session]
     ...     dbname: nonexistant

=== modified file 'lib/canonical/launchpad/scripts/garbo.py'
--- lib/canonical/launchpad/scripts/garbo.py	2010-03-26 14:33:46 +0000
+++ lib/canonical/launchpad/scripts/garbo.py	2010-04-05 12:47:32 +0000
@@ -29,7 +29,7 @@
 from canonical.launchpad.utilities.looptuner import (
     DBLoopTuner, TunableLoop)
 from canonical.launchpad.webapp.interfaces import (
-    IStoreSelector, AUTH_STORE, MAIN_STORE, MASTER_FLAVOR)
+    IStoreSelector, MAIN_STORE, MASTER_FLAVOR)
 from lp.bugs.interfaces.bug import IBugSet
 from lp.bugs.interfaces.bugjob import ICalculateBugHeatJobSource
 from lp.bugs.model.bugnotification import BugNotification
@@ -121,19 +121,17 @@
         transaction.commit()
 
 
-class OpenIDAssociationPruner(TunableLoop):
+class OpenIDConsumerAssociationPruner(TunableLoop):
     minimum_chunk_size = 3500
     maximum_chunk_size = 50000
 
-    table_name = 'OpenIDAssociation'
-    store_name = AUTH_STORE
+    table_name = 'OpenIDConsumerAssociation'
 
     _num_removed = None
 
     def __init__(self, log, abort_time=None):
-        super(OpenIDAssociationPruner, self).__init__(log, abort_time)
-        self.store = getUtility(IStoreSelector).get(
-            self.store_name, MASTER_FLAVOR)
+        super(OpenIDConsumerAssociationPruner, self).__init__(log, abort_time)
+        self.store = getUtility(IStoreSelector).get(MAIN_STORE, MASTER_FLAVOR)
 
     def __call__(self, chunksize):
         result = self.store.execute("""
@@ -152,11 +150,6 @@
         return self._num_removed == 0
 
 
-class OpenIDConsumerAssociationPruner(OpenIDAssociationPruner):
-    table_name = 'OpenIDConsumerAssociation'
-    store_name = MAIN_STORE
-
-
 class RevisionCachePruner(TunableLoop):
     """A tunable loop to remove old revisions from the cache."""
 
@@ -869,7 +862,6 @@
     tunable_loops = [
         OAuthNoncePruner,
         OpenIDConsumerNoncePruner,
-        OpenIDAssociationPruner,
         OpenIDConsumerAssociationPruner,
         RevisionCachePruner,
         BugHeatUpdater,

=== modified file 'lib/canonical/launchpad/scripts/tests/test_garbo.py'
--- lib/canonical/launchpad/scripts/tests/test_garbo.py	2010-01-22 06:03:19 +0000
+++ lib/canonical/launchpad/scripts/tests/test_garbo.py	2010-04-05 12:47:32 +0000
@@ -29,11 +29,11 @@
 from lp.testing import TestCase, TestCaseWithFactory
 from canonical.launchpad.scripts.garbo import (
     DailyDatabaseGarbageCollector, HourlyDatabaseGarbageCollector,
-    OpenIDAssociationPruner, OpenIDConsumerAssociationPruner)
+    OpenIDConsumerAssociationPruner)
 from canonical.launchpad.scripts.tests import run_script
 from canonical.launchpad.scripts.logger import QuietFakeLogger
 from canonical.launchpad.webapp.interfaces import (
-    IStoreSelector, MASTER_FLAVOR)
+    IStoreSelector, MAIN_STORE, MASTER_FLAVOR)
 from canonical.testing.layers import (
     DatabaseLayer, LaunchpadScriptLayer, LaunchpadZopelessLayer)
 from lp.bugs.model.bugnotification import (
@@ -219,12 +219,12 @@
                 Min(CodeImportResult.date_created)).one().replace(tzinfo=UTC)
             >= now - timedelta(days=30))
 
-    def test_OpenIDAssociationPruner(self, pruner=OpenIDAssociationPruner):
-        store_name = pruner.store_name
+    def test_OpenIDConsumerAssociationPruner(self):
+        pruner = OpenIDConsumerAssociationPruner
         table_name = pruner.table_name
         LaunchpadZopelessLayer.switchDbUser('testadmin')
         store_selector = getUtility(IStoreSelector)
-        store = store_selector.get(store_name, MASTER_FLAVOR)
+        store = store_selector.get(MAIN_STORE, MASTER_FLAVOR)
         now = time.time()
         # Create some associations in the past with lifetimes
         for delta in range(0, 20):
@@ -247,7 +247,7 @@
         self.runHourly()
 
         LaunchpadZopelessLayer.switchDbUser('testadmin')
-        store = store_selector.get(store_name, MASTER_FLAVOR)
+        store = store_selector.get(MAIN_STORE, MASTER_FLAVOR)
         # Confirm all the rows we know should have been expired have
         # been expired. These are the ones that would be expired using
         # the test start time as 'now'.
@@ -263,9 +263,6 @@
             "SELECT COUNT(*) FROM %s" % table_name).get_one()[0]
         self.failUnless(num_unexpired > 0)
 
-    def test_OpenIDConsumerAssociationPruner(self):
-        self.test_OpenIDAssociationPruner(OpenIDConsumerAssociationPruner)
-
     def test_RevisionAuthorEmailLinker(self):
         LaunchpadZopelessLayer.switchDbUser('testadmin')
         rev1 = self.factory.makeRevision('Author 1 <[e-mail]>')
@@ -373,6 +370,7 @@
 
         # If we remove the email address that was subscribed, the
         # garbage collector removes the subscription.
+        LaunchpadZopelessLayer.switchDbUser('testadmin')
         Store.of(email).remove(email)
         transaction.commit()
         self.runDaily()

=== modified file 'lib/canonical/launchpad/webapp/adapter.py'
--- lib/canonical/launchpad/webapp/adapter.py	2010-03-25 11:58:42 +0000
+++ lib/canonical/launchpad/webapp/adapter.py	2010-04-05 12:47:32 +0000
@@ -40,14 +40,13 @@
 from canonical.launchpad.readonly import is_read_only
 from canonical.launchpad.webapp.dbpolicy import MasterDatabasePolicy
 from canonical.launchpad.webapp.interfaces import (
-    AUTH_STORE, DEFAULT_FLAVOR, IStoreSelector,
-    MAIN_STORE, MASTER_FLAVOR, ReadOnlyModeViolation, SLAVE_FLAVOR)
+    DEFAULT_FLAVOR, IStoreSelector, MAIN_STORE, MASTER_FLAVOR,
+    ReadOnlyModeViolation, SLAVE_FLAVOR)
 from canonical.launchpad.webapp.opstats import OpStats
 from canonical.lazr.utils import safe_hasattr
 
 
 __all__ = [
-    'DisconnectionError',
     'RequestExpired',
     'set_request_started',
     'clear_request_started',
@@ -327,7 +326,7 @@
 
     def __init__(self, uri):
         # The uri is just a property name in the config, such as main_master
-        # or auth_slave.
+        # or main_slave.
         # We don't invoke the superclass constructor as it has a very limited
         # opinion on what uri is.
         # pylint: disable-msg=W0231
@@ -356,7 +355,7 @@
                 'Connection uri %s does not match section-realm-flavor format'
                 % repr(self._uri.database))
 
-        assert realm in ('main', 'auth'), 'Unknown realm %s' % realm
+        assert realm == 'main', 'Unknown realm %s' % realm
         assert flavor in ('master', 'slave'), 'Unknown flavor %s' % flavor
 
         my_dbconfig = DatabaseConfig()
@@ -572,14 +571,6 @@
         return db_policy.getStore(name, flavor)
 
 
-# There are not many tables outside of the main replication set, so we
-# can just maintain a hardcoded list of what isn't in there for now.
-_auth_store_tables = frozenset([
-    'Account', 'AccountPassword', 'AuthToken', 'EmailAddress',
-    'OpenIDAssociation', 'OpenIDAuthorization', 'OpenIDNonce',
-    'OpenIDRPSummary'])
-
-
 # We want to be able to adapt a Storm class to an IStore, IMasterStore or
 # ISlaveStore. Unfortunately, the component architecture provides no
 # way for us to declare that a class, and all its subclasses, provides
@@ -588,9 +579,7 @@
 def get_store(storm_class, flavor=DEFAULT_FLAVOR):
     """Return a flavored Store for the given database class."""
     table = getattr(removeSecurityProxy(storm_class), '__storm_table__', None)
-    if table in _auth_store_tables:
-        return getUtility(IStoreSelector).get(AUTH_STORE, flavor)
-    elif table is not None:
+    if table is not None:
         return getUtility(IStoreSelector).get(MAIN_STORE, flavor)
     else:
         return None

=== modified file 'lib/canonical/launchpad/webapp/ftests/test_adapter_permissions.txt'
--- lib/canonical/launchpad/webapp/ftests/test_adapter_permissions.txt	2009-06-11 01:28:55 +0000
+++ lib/canonical/launchpad/webapp/ftests/test_adapter_permissions.txt	2010-04-05 12:47:32 +0000
@@ -10,8 +10,7 @@
 
     >>> from lp.registry.model.person import Person
     >>> from canonical.launchpad.webapp.interfaces import (
-    ...     IStoreSelector, AUTH_STORE, MAIN_STORE,
-    ...     MASTER_FLAVOR, SLAVE_FLAVOR)
+    ...     IStoreSelector, MAIN_STORE, MASTER_FLAVOR, SLAVE_FLAVOR)
     >>> import transaction
     >>> from zope.component import getUtility
 
@@ -47,25 +46,3 @@
     >>> main_master.find(Person, name='janitor').one().displayname
     u'BenD'
     >>> transaction.abort()
-
-
-A MASTER_FLAVOR Store does not allow writes to tables outside of that
-Store's replication set.
-
-    >>> t = transaction.begin()
-    >>> person = main_master.find(Person, name='no-priv').one()
-    >>> account = person.account
-    >>> account.displayname = "Ben Dover"
-    >>> main_master.flush()
-    Traceback (most recent call last):
-    ...
-    ProgrammingError: permission denied for relation account
-    >>> transaction.abort()
-
-    >>> t = transaction.begin()
-    >>> auth_master = getUtility(IStoreSelector).get(AUTH_STORE, MASTER_FLAVOR)
-    >>> person = auth_master.find(Person, name='no-priv').one()
-    >>> account = person.account
-    >>> account.displayname = "Ben Dover"
-    >>> auth_master.flush()
-    >>> transaction.abort()

=== modified file 'lib/canonical/launchpad/webapp/interfaces.py'
--- lib/canonical/launchpad/webapp/interfaces.py	2010-03-26 22:57:38 +0000
+++ lib/canonical/launchpad/webapp/interfaces.py	2010-04-05 12:47:32 +0000
@@ -745,9 +745,7 @@
 #
 
 MAIN_STORE = 'main' # The main database.
-AUTH_STORE = 'auth' # The authentication database.
-
-ALL_STORES = frozenset([MAIN_STORE, AUTH_STORE])
+ALL_STORES = frozenset([MAIN_STORE])
 
 DEFAULT_FLAVOR = 'default' # Default flavor for current state.
 MASTER_FLAVOR = 'master' # The master database.

=== modified file 'lib/canonical/launchpad/webapp/tests/test_dbpolicy.py'
--- lib/canonical/launchpad/webapp/tests/test_dbpolicy.py	2010-02-24 23:18:40 +0000
+++ lib/canonical/launchpad/webapp/tests/test_dbpolicy.py	2010-04-05 12:47:32 +0000
@@ -25,7 +25,7 @@
     ReadOnlyLaunchpadDatabasePolicy, SlaveDatabasePolicy,
     SlaveOnlyDatabasePolicy)
 from canonical.launchpad.webapp.interfaces import (
-    ALL_STORES, AUTH_STORE, DEFAULT_FLAVOR, DisallowedStore, IDatabasePolicy,
+    ALL_STORES, DEFAULT_FLAVOR, DisallowedStore, IDatabasePolicy,
     IStoreSelector, MAIN_STORE, MASTER_FLAVOR, ReadOnlyModeDisallowedStore,
     SLAVE_FLAVOR)
 from canonical.launchpad.webapp.servers import LaunchpadTestRequest
@@ -47,9 +47,6 @@
         main_store = store_selector.get(MAIN_STORE, DEFAULT_FLAVOR)
         self.failUnlessEqual(self.getDBUser(main_store), 'launchpad_main')
 
-        auth_store = store_selector.get(AUTH_STORE, DEFAULT_FLAVOR)
-        self.failUnlessEqual(self.getDBUser(auth_store), 'launchpad_auth')
-
     def getDBUser(self, store):
         return store.execute(
             'SHOW session_authorization').get_one()[0]

=== removed symlink 'lib/canonical/signon'
=== target was u'../../sourcecode/canonical-identity-provider'
=== modified file 'lib/lp/bugs/doc/checkwatches.txt'
--- lib/lp/bugs/doc/checkwatches.txt	2010-03-26 15:24:59 +0000
+++ lib/lp/bugs/doc/checkwatches.txt	2010-04-05 12:47:32 +0000
@@ -337,9 +337,13 @@
 If a bug tracker doesn't have any watches to update, forceUpdateAll()
 will ignore it.
 
+    >>> transaction.commit()
+    >>> LaunchpadZopelessLayer.switchDbUser('launchpad')
     >>> login('[e-mail]')
     >>> empty_tracker = factory.makeBugTracker(
     ...     'http://example.com', BugTrackerType.ROUNDUP)
+    >>> transaction.commit()
+    >>> LaunchpadZopelessLayer.switchDbUser(config.checkwatches.dbuser)
     >>> empty_tracker_name = empty_tracker.name
     >>> update_all(empty_tracker_name)
     INFO Bug tracker 'auto-example.com' doesn't have any watches. Ignoring.

=== modified file 'lib/lp/bugs/doc/externalbugtracker-comment-imports.txt'
--- lib/lp/bugs/doc/externalbugtracker-comment-imports.txt	2010-03-25 14:28:33 +0000
+++ lib/lp/bugs/doc/externalbugtracker-comment-imports.txt	2010-04-05 12:47:32 +0000
@@ -373,8 +373,10 @@
 since they aren't a valid Launchpad user, having been created during the
 import process.
 
-We'll add a listener to check for Karma events.
+We'll create a bug watch and add a listener to check for Karma events.
 
+    >>> LaunchpadZopelessLayer.switchDbUser('launchpad')
+    >>> bug_watch = factory.makeBugWatch('123456')
     >>> from lp.registry.tests.karma import KarmaAssignedEventListener
     >>> karma_helper = KarmaAssignedEventListener()
     >>> karma_helper.register_listener()
@@ -382,8 +384,6 @@
 Importing a comment with a CVE reference will produce a CVE link in
 Launchpad but will result in no Karma records being created.
 
-    >>> LaunchpadZopelessLayer.switchDbUser('launchpad')
-    >>> bug_watch = factory.makeBugWatch('123456')
     >>> transaction.commit()
     >>> LaunchpadZopelessLayer.switchDbUser(config.checkwatches.dbuser)
     >>> external_bugtracker.remote_comments = {

=== modified file 'lib/lp/code/doc/branch-karma.txt'
--- lib/lp/code/doc/branch-karma.txt	2010-02-16 20:36:48 +0000
+++ lib/lp/code/doc/branch-karma.txt	2010-04-05 12:47:32 +0000
@@ -49,6 +49,7 @@
 You get karma for linking a bug to a branch.
 
     >>> bug = factory.makeBug(product=fooix)
+    Karma added: action=bugcreated, product=fooix, person=person-name11
     >>> branch_link = bug.linkBranch(branch, eric)
     Karma added: action=bugbranchcreated, product=fooix, person=eric
 

=== modified file 'lib/lp/registry/model/person.py'
--- lib/lp/registry/model/person.py	2010-03-24 23:19:52 +0000
+++ lib/lp/registry/model/person.py	2010-04-05 12:47:32 +0000
@@ -124,7 +124,7 @@
     TeamMembershipStatus)
 from lp.registry.interfaces.wikiname import IWikiName, IWikiNameSet
 from canonical.launchpad.webapp.interfaces import (
-    AUTH_STORE, ILaunchBag, IStoreSelector, MASTER_FLAVOR)
+    ILaunchBag, IStoreSelector, MASTER_FLAVOR)
 
 from lp.soyuz.model.archive import Archive
 from lp.registry.model.codeofconduct import SignedCodeOfConduct
@@ -263,22 +263,7 @@
         return '<Person at 0x%x %s (%s)>' % (
             id(self), self.name, self.displayname)
 
-    def _sync_displayname(self, attr, value):
-        """Update any related Account.displayname.
-
-        We can't do this in a DB trigger as soon the Account table will
-        in a separate database to the Person table.
-        """
-        if self.accountID is not None:
-            auth_store = getUtility(IStoreSelector).get(
-                AUTH_STORE, MASTER_FLAVOR)
-            account = auth_store.get(Account, self.accountID)
-            if account.displayname != value:
-                account.displayname = value
-        return value
-
-    displayname = StringCol(dbName='displayname', notNull=True,
-                            storm_validator=_sync_displayname)
+    displayname = StringCol(dbName='displayname', notNull=True)
 
     teamdescription = StringCol(dbName='teamdescription', default=None)
     homepage_content = StringCol(default=None)

=== modified file 'lib/lp/registry/stories/person/xx-admin-person-review.txt'
--- lib/lp/registry/stories/person/xx-admin-person-review.txt	2010-01-30 22:39:54 +0000
+++ lib/lp/registry/stories/person/xx-admin-person-review.txt	2010-04-05 12:47:32 +0000
@@ -63,7 +63,7 @@
     >>> print admin_browser.title
     The one and only Salgado does not use Launchpad
     >>> print get_feedback_messages(admin_browser.contents)[0]
-    The account "The one and only Salgado" has been suspended.
+    The account "Guilherme Salgado" has been suspended.
 
 The admin can see the account information of a user that does not use
 Launchpad, and can change the account too. Note that all pages that belong

=== modified file 'lib/lp/registry/tests/test_personset.py'
--- lib/lp/registry/tests/test_personset.py	2010-03-11 20:54:36 +0000
+++ lib/lp/registry/tests/test_personset.py	2010-04-05 12:47:32 +0000
@@ -99,23 +99,19 @@
         # Person in question.
 
         # Create a testing `Account` and a testing `Person` directly,
-        # linked. However the `Account` email is not linked to the
-        # `Person`.
+        # linked.
         testing_account = self.factory.makeAccount(
             self.displayname, email=self.email_address)
         testing_person = removeSecurityProxy(
             testing_account).createPerson(self.rationale)
-        self.assertIs(None, testing_account.preferredemail.person)
-        self.assertIs(None, testing_person.preferredemail)
+        self.assertEqual(
+            testing_person, testing_account.preferredemail.person)
 
+        # Since there's an existing Person for the given email address,
+        # IPersonSet.ensurePerson() will just return it.
         ensured_person = self.person_set.ensurePerson(
             self.email_address, self.displayname, self.rationale)
-
-        # The existing Person was retrieved and the Account
-        # 'preferredemail' is also bound to the existing Person.
-        self.assertEquals(testing_person.id, ensured_person.id)
-        self.assertEquals(testing_account.preferredemail.id,
-                          ensured_person.preferredemail.id)
+        self.assertEqual(testing_person, ensured_person)
 
 
 class TestPersonSetMerge(TestCaseWithFactory):

=== modified file 'lib/lp/testopenid/browser/server.py'
--- lib/lp/testopenid/browser/server.py	2010-02-24 12:52:08 +0000
+++ lib/lp/testopenid/browser/server.py	2010-04-05 12:47:32 +0000
@@ -6,7 +6,7 @@
 __all__ = [
     'PersistentIdentityView',
     'TestOpenIDApplicationNavigation',
-    'TestOpenIDIndexView'
+    'TestOpenIDIndexView',
     'TestOpenIDLoginView',
     'TestOpenIDRootUrlData',
     'TestOpenIDView',
@@ -21,6 +21,7 @@
 from zope.security.proxy import isinstance as zisinstance
 from zope.session.interfaces import ISession
 
+from openid import oidutil
 from openid.server.server import CheckIDRequest, Server
 from openid.store.memstore import MemoryStore
 
@@ -47,6 +48,10 @@
 openid_store = MemoryStore()
 
 
+# Shut up noisy OpenID library
+oidutil.log = lambda message, level=0: None
+
+
 class TestOpenIDRootUrlData:
     """`ICanonicalUrlData` for the test OpenID provider."""
 

=== modified file 'utilities/sourcedeps.conf'
--- utilities/sourcedeps.conf	2010-03-26 17:53:41 +0000
+++ utilities/sourcedeps.conf	2010-04-05 12:47:32 +0000
@@ -15,5 +15,4 @@
 subunit lp:~launchpad-pqm/subunit/trunk;revno=61
 subvertpy lp:~launchpad-pqm/subvertpy/trunk;revno=2040
 testresources lp:~launchpad-pqm/testresources/dev;revno=16
-canonical-identity-provider lp:~launchpad-pqm/canonical-identity-provider/trunk;revno=8903 optional
 shipit lp:~launchpad-pqm/shipit/trunk;revno=8903 optional