diff --git a/neutron/db/migration/alembic_migrations/versions/477a4488d3f4_ml2_vxlan_type_driver.py b/neutron/db/migration/alembic_migrations/versions/477a4488d3f4_ml2_vxlan_type_driver.py
index a57617e445..8f54b51b81 100644
--- a/neutron/db/migration/alembic_migrations/versions/477a4488d3f4_ml2_vxlan_type_driver.py
+++ b/neutron/db/migration/alembic_migrations/versions/477a4488d3f4_ml2_vxlan_type_driver.py
@@ -55,9 +55,9 @@ def upgrade(active_plugins=None, options=None):
     op.create_table(
         'ml2_vxlan_endpoints',
         sa.Column('ip_address', sa.String(length=64)),
-        sa.Column('udp_port', sa.Integer(), nullable=False),
-        sa.PrimaryKeyConstraint('ip_address'),
-        sa.PrimaryKeyConstraint('udp_port')
+        sa.Column('udp_port', sa.Integer(), nullable=False,
+                  autoincrement=False),
+        sa.PrimaryKeyConstraint('ip_address', 'udp_port')
     )
 
 
diff --git a/neutron/plugins/ml2/drivers/type_vxlan.py b/neutron/plugins/ml2/drivers/type_vxlan.py
index 75f7d0b0ff..a5c7f1206f 100644
--- a/neutron/plugins/ml2/drivers/type_vxlan.py
+++ b/neutron/plugins/ml2/drivers/type_vxlan.py
@@ -59,7 +59,8 @@ class VxlanEndpoints(model_base.BASEV2):
     __tablename__ = 'ml2_vxlan_endpoints'
 
     ip_address = sa.Column(sa.String(64), primary_key=True)
-    udp_port = sa.Column(sa.Integer, primary_key=True, nullable=False)
+    udp_port = sa.Column(sa.Integer, primary_key=True, nullable=False,
+                         autoincrement=False)
 
     def __repr__(self):
         return "<VxlanTunnelEndpoint(%s)>" % self.ip_address