That  fix did get past the sa_instance_state problem, but I bumped into something new.  It looks like floating_ip_update() doesn't like the SA fixed ip that's fetched here:

+            updates['fixed_ip'] = db.fixed_ip_get(context, id_)

I'm not sure what "A conflicting state is already present in the identity map" means.  Is there another way to fetch the fixed ip?

Traceback:

Jun 25 17:30:21 10.35.0.14 nova-network 2014-06-25 17:30:21.764 4992 ERROR oslo.messaging.rpc.dispatcher [-] Exception during message handling: A conflicting state is already present in the identity map for key (<class 'nova.db.sqlalchemy.models.FixedIp'>, (3L,))
2014-06-25 17:30:21.764 4992 TRACE oslo.messaging.rpc.dispatcher Traceback (most recent call last):
2014-06-25 17:30:21.764 4992 TRACE oslo.messaging.rpc.dispatcher   File "/usr/lib64/python2.7/site-packages/oslo/messaging/rpc/dispatcher.py", line 133, in _dispatch_and_reply
2014-06-25 17:30:21.764 4992 TRACE oslo.messaging.rpc.dispatcher   File "/usr/lib64/python2.7/site-packages/oslo/messaging/rpc/dispatcher.py", line 176, in _dispatch
2014-06-25 17:30:21.764 4992 TRACE oslo.messaging.rpc.dispatcher   File "/usr/lib64/python2.7/site-packages/oslo/messaging/rpc/dispatcher.py", line 122, in _do_dispatch
2014-06-25 17:30:21.764 4992 TRACE oslo.messaging.rpc.dispatcher   File "/usr/lib64/python2.7/site-packages/nova/network/floating_ips.py", line 575, in migrate_instance_start
2014-06-25 17:30:21.764 4992 TRACE oslo.messaging.rpc.dispatcher   File "/usr/lib64/python2.7/site-packages/nova/objects/base.py", line 151, in wrapper
2014-06-25 17:30:21.764 4992 TRACE oslo.messaging.rpc.dispatcher   File "/usr/lib64/python2.7/site-packages/nova/objects/floating_ip.py", line 135, in save
2014-06-25 17:30:21.764 4992 TRACE oslo.messaging.rpc.dispatcher   File "/usr/lib64/python2.7/site-packages/nova/db/api.py", line 386, in floating_ip_update
2014-06-25 17:30:21.764 4992 TRACE oslo.messaging.rpc.dispatcher   File "/usr/lib64/python2.7/site-packages/nova/db/sqlalchemy/api.py", line 164, in wrapper
2014-06-25 17:30:21.764 4992 TRACE oslo.messaging.rpc.dispatcher   File "/usr/lib64/python2.7/site-packages/nova/db/sqlalchemy/api.py", line 1024, in floating_ip_update
2014-06-25 17:30:21.764 4992 TRACE oslo.messaging.rpc.dispatcher   File "/usr/lib64/python2.7/site-packages/nova/openstack/common/db/sqlalchemy/models.py", line 88, in update
2014-06-25 17:30:21.764 4992 TRACE oslo.messaging.rpc.dispatcher   File "/usr/lib64/python2.7/site-packages/sqlalchemy/orm/attributes.py", line 220, in __set__
2014-06-25 17:30:21.764 4992 TRACE oslo.messaging.rpc.dispatcher   File "/usr/lib64/python2.7/site-packages/sqlalchemy/orm/attributes.py", line 780, in set
2014-06-25 17:30:21.764 4992 TRACE oslo.messaging.rpc.dispatcher   File "/usr/lib64/python2.7/site-packages/sqlalchemy/orm/attributes.py", line 801, in fire_replace_event
2014-06-25 17:30:21.764 4992 TRACE oslo.messaging.rpc.dispatcher   File "/usr/lib64/python2.7/site-packages/sqlalchemy/orm/unitofwork.py", line 87, in set_
2014-06-25 17:30:21.764 4992 TRACE oslo.messaging.rpc.dispatcher   File "/usr/lib64/python2.7/site-packages/sqlalchemy/orm/session.py", line 1490, in _save_or_update_state
2014-06-25 17:30:21.764 4992 TRACE oslo.messaging.rpc.dispatcher   File "/usr/lib64/python2.7/site-packages/sqlalchemy/orm/session.py", line 1746, in _save_or_update_impl
2014-06-25 17:30:21.764 4992 TRACE oslo.messaging.rpc.dispatcher   File "/usr/lib64/python2.7/site-packages/sqlalchemy/orm/session.py", line 1739, in _update_impl
2014-06-25 17:30:21.764 4992 TRACE oslo.messaging.rpc.dispatcher   File "/usr/lib64/python2.7/site-packages/sqlalchemy/orm/identity.py", line 119, in add
2014-06-25 17:30:21.764 4992 TRACE oslo.messaging.rpc.dispatcher AssertionError: A conflicting state is already present in the identity map for key (<class 'nova.db.sqlalchemy.models.FixedIp'>, (3L,))
2014-06-25 17:30:21.764 4992 TRACE oslo.messaging.rpc.dispatcher 
Jun 25 17:30:21 10.35.0.14 nova-network 2014-06-25 17:30:21.765 4992 ERROR oslo.messaging._drivers.common [-] Returning exception A conflicting state is already present in the identity map for key (<class 'nova.db.sqlalchemy.models.FixedIp'>, (3L,)) to caller
Jun 25 17:30:21 10.35.0.14 nova-network 2014-06-25 17:30:21.766 4992 ERROR oslo.messaging._drivers.common [-] ['Traceback (most recent call last):\n', '  File "/usr/lib64/python2.7/site-packages/oslo/messaging/rpc/dispatcher.py", line 133, in _dispatch_and_reply\n', '  File "/usr/lib64/python2.7/site-packages/oslo/messaging/rpc/dispatcher.py", line 176, in _dispatch\n', '  File "/usr/lib64/python2.7/site-packages/oslo/messaging/rpc/dispatcher.py", line 122, in _do_dispatch\n', '  File "/usr/lib64/python2.7/site-packages/nova/network/floating_ips.py", line 575, in migrate_instance_start\n', '  File "/usr/lib64/python2.7/site-packages/nova/objects/base.py", line 151, in wrapper\n', '  File "/usr/lib64/python2.7/site-packages/nova/objects/floating_ip.py", line 135, in save\n', '  File "/usr/lib64/python2.7/site-packages/nova/db/api.py", line 386, in floating_ip_update\n', '  File "/usr/lib64/python2.7/site-packages/nova/db/sqlalchemy/api.py", line 164, in wrapper\n', '  File "/usr/lib64/python2.7/site-packages/nova/db/sqlalchemy/api.py", line 1024, in floating_ip_update\n', '  File "/usr/lib64/python2.7/site-packages/nova/openstack/common/db/sqlalchemy/models.py", line 88, in update\n', '  File "/usr/lib64/python2.7/site-packages/sqlalchemy/orm/attributes.py", line 220, in __set__\n', '  File "/usr/lib64/python2.7/site-packages/sqlalchemy/orm/attributes.py", line 780, in set\n', '  File "/usr/lib64/python2.7/site-packages/sqlalchemy/orm/attributes.py", line 801, in fire_replace_event\n', '  File "/usr/lib64/python2.7/site-packages/sqlalchemy/orm/unitofwork.py", line 87, in set_\n', '  File "/usr/lib64/python2.7/site-packages/sqlalchemy/orm/session.py", line 1490, in _save_or_update_state\n', '  File "/usr/lib64/python2.7/site-packages/sqlalchemy/orm/session.py", line 1746, in _save_or_update_impl\n', '  File "/usr/lib64/python2.7/site-packages/sqlalchemy/orm/session.py", line 1739, in _update_impl\n', '  File "/usr/lib64/python2.7/site-packages/sqlalchemy/orm/identity.py", line 119, in add\n', "AssertionError: A conflicting state is already present in the identity map for key (<class 'nova.db.sqlalchemy.models.FixedIp'>, (3L,))\n"]
Jun 25 17:30:21 10.35.0.14 nova-network.log: /usr/lib64/python2.7/site-packages/amqp/channel.py:616: VDeprecationWarning: The auto_delete flag for exchanges has been deprecated and will be removed
Jun 25 17:30:21 10.35.0.14 nova-network.log: from py-amqp v1.5.0.
Jun 25 17:30:21 10.35.0.14 nova-network.log: /usr/lib64/python2.7/site-packages/amqp/channel.py:616: VDeprecationWarning: The auto_delete flag for exchanges has been deprecated and will be removed
Jun 25 17:30:21 10.35.0.14 nova-network.log: from py-amqp v1.5.0.