Cannot create new flavor because flavor migration fails after upgrade

Issue

openstack flavor create --id 10 --vcpus 16 --ram 49152 --disk 40 cdv.prod
Not all flavors have been migrated to the API database (HTTP 409) (Request-ID: req-46d15143-a8f5-4694-bc41-4a2d06fff0b8)

[root@control-02 (openstack_admin)]# nova-manage db online_data_migrations
Option "verbose" from group "DEFAULT" is deprecated for removal.  Its value may be silently ignored in the future.
Option "notification_driver" from group "DEFAULT" is deprecated. Use option "driver" from group "oslo_messaging_notifications".
Option "notification_topics" from group "DEFAULT" is deprecated. Use option "topics" from group "oslo_messaging_notifications".
Running batches of 50 until complete
Error attempting to run <function migrate_flavors at 0x5585d70>
43 rows matched query migrate_instance_keypairs, 43 migrated
7 rows matched query migrate_instances_add_request_spec, 7 migrated
Error attempting to run <function migrate_flavors at 0x5585d70>
48 rows matched query migrate_instances_add_request_spec, 12 migrated
38 rows matched query migrate_keypairs_to_api_db, 38 migrated
Error attempting to run <function migrate_flavors at 0x5585d70>
16 rows matched query migrate_keypairs_to_api_db, 16 migrated
Error attempting to run <function migrate_flavors at 0x5585d70>

• nova/nova-api.log

2017-04-13 11:28:17.928 6079 WARNING nova.objects.flavor [req-46d15143-a8f5-4694-bc41-4a2d06fff0b8 533ad9ab4fed403fb98f1ffc2f2b4436 c53c18b2d29641e0877bbbd8d87f8267 - default default] Main database contains 6 unmigrated flavors
2017-04-13 11:28:17.929 6079 INFO nova.api.openstack.wsgi [req-46d15143-a8f5-4694-bc41-4a2d06fff0b8 533ad9ab4fed403fb98f1ffc2f2b4436 c53c18b2d29641e0877bbbd8d87f8267 - default default] HTTP exception thrown: Not all flavors have been migrated to the API database