Can't upgrade from 2013.2 or 2013.2.1 to Juno

[Brant Knudson]

`keystone-manage db_sync` fails when you start from the 2013.2 or 2013.2.1 release.

The failure is like

 CRITICAL keystone [-] KeyError: <VerNum(35)>

The migrations for 2013.2 and 2013.2.1 end at '034_add_default_project_id_column_to_user.py'.

The migrations for Juno start at '036_havana.py'.

The migrations for 2013.2.2 end at '036_token_drop_valid_index.py', so migration from that release works.

The Juno migrations should be changed so that it supports going from 034.

[Brant Knudson (blk-u)]

Do I need to backport this to icehouse?

[Brant Knudson (blk-u)]

I checked and Juno was when we squashed migrations, so no change to icehouse.

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/114827

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/114828

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/114827
Committed: https://git.openstack.org/cgit/openstack/keystone/commit/?id=48e508f0c56119411f9894b6d352937d6eecca91
Submitter: Jenkins
Branch: master

commit 48e508f0c56119411f9894b6d352937d6eecca91
Author: Brant Knudson <email address hidden>
Date: Sun Aug 17 11:58:18 2014 -0500

    Back off initial migration to 35

    Upgrading from the Havana release to Juno is failing because the
    initial Juno migration doesn't include a couple of migrations that
    weren't in the initial Havana release but were added afterwards.

    This change adds the 036 migration from Havana back in and moves
    the initial Juno migration back to 035.

    Change-Id: I1045696d66d7a63587aaaf70230a5eaf46e7d65d
    Partial-Bug: #1357498

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/114828
Committed: https://git.openstack.org/cgit/openstack/keystone/commit/?id=84e0218701a9a52ba771d58e91e486ae9d0b8ea0
Submitter: Jenkins
Branch: master

commit 84e0218701a9a52ba771d58e91e486ae9d0b8ea0
Author: Brant Knudson <email address hidden>
Date: Sun Aug 17 12:09:26 2014 -0500

    Back off initial migration to 34

    Upgrading from the Havana release to Juno was failing because the
    initial Juno migration didn't include a couple of migrations that
    weren't in the initial Havana release but were added afterwards.

    This change adds the 035 migration from Havana back in and moves
    the initial Juno migration back to 034.

    Change-Id: I012b3f707659557d1774bae78b1dd652bb1a4dd7
    Closes-Bug: #1357498