VPN Migration does not specify correct plugin

[Salvatore Orlando]

The VPN migration (rev: 52ff27f7567a) currently applies to:

neutron.services.vpn.plugin.VPNPlugin

However, the above plugin is pretty much just a class inheriting from the base db support class, and not useful in practice.
In fact, devstack configures neutron with:

neutron.services.vpn.plugin.VPNDriverPlugin

As a result, the migration is skipped for the VPN service, and VPN models are auto-generated by Neutron at startup rather than being created by the migration.

This is evident when disabling auto-generation of db models, as reported by the following logs
1) Taken running devstack locally with auto schema generation suppressed: http://paste.openstack.org/show/47394/
2) Gate failure for https://review.openstack.org/#/c/40296/: http://logs.openstack.org/96/40296/6/check/gate-tempest-devstack-vm-neutron/b27ff34/logs/screen-q-svc.txt.gz

diff --git a/neutron/db/migration/alembic_migrations/versions/52ff27f7567a_support_for_vpnaas.py b/neutron/db/migration/alembic_migrations/versions/52ff27f7567a_support_for_vpnaas.py
index c83804e..41f934d 100644
--- a/neutron/db/migration/alembic_migrations/versions/52ff27f7567a_support_for_vpnaas.py
+++ b/neutron/db/migration/alembic_migrations/versions/52ff27f7567a_support_for_vpnaas.py
@@ -30,7 +30,7 @@ down_revision = '39cf3f799352'
 # Change to ['*'] if this migration applies to all plugins

 migration_for_plugins = [
- 'neutron.services.vpn.plugin.VPNPlugin',
+ 'neutron.services.vpn.plugin.VPNDriverPlugin',
 ]

[OpenStack Infra (hudson-openstack)]

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

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/47920
Committed: http://github.com/openstack/neutron/commit/7a3e935cf6f52974028241d38e11a8d510441724
Submitter: Jenkins
Branch: master

commit 7a3e935cf6f52974028241d38e11a8d510441724
Author: Salvatore Orlando <email address hidden>
Date: Mon Sep 23 13:42:53 2013 -0700

    Apply VPN migration to correct plugin

    This patch ensures the migration is executed when
    VPNDriverPlugin is loaded among service plugins.

    Bug 1229394

    Change-Id: Ibf50d23aebc60b2ba22ef5a51c268b93761c2171