Description of problem:

This is an FFU step that is upgrading from OSP10z8 + OVS 2.9 to OSP13.
On a recent puddle (20180621), toward the end of 'openstack undercloud upgrade' (from OSP12 to OSP13), I get this:

2018-06-21 09:30:29,742 INFO: Not creating flavor "swift-storage" because it already exists.
2018-06-21 09:30:29,868 INFO: Flavor swift-storage updated to use custom resource class baremetal
2018-06-21 09:30:29,869 INFO: Configuring Mistral workbooks
2018-06-21 09:30:58,795 INFO: Mistral workbooks configured successfully
2018-06-21 09:30:59,425 INFO: Not creating default plan "overcloud" because it already exists.
2018-06-21 09:30:59,425 INFO: Configuring an hourly cron trigger for tripleo-ui logging
2018-06-21 09:31:02,453 INFO: Added _member_ role to admin user
2018-06-21 09:31:03,656 INFO: Migrating stack "b5424905-ec4d-4357-acc0-13eb15161135" to convergence engine
2018-06-21 09:32:02,785 ERROR: heat-manage failed: ERROR: 'NoneType' object has no attribute '__getitem__'
Traceback (most recent call last):

  File "/usr/lib/python2.7/site-packages/oslo_messaging/rpc/server.py", line 163, in _process_incoming
    res = self.dispatcher.dispatch(message)

  File "/usr/lib/python2.7/site-packages/oslo_messaging/rpc/dispatcher.py", line 220, in dispatch
    return self._do_dispatch(endpoint, method, ctxt, args)

  File "/usr/lib/python2.7/site-packages/oslo_messaging/rpc/dispatcher.py", line 190, in _do_dispatch
    result = func(ctxt, **new_args)

  File "/usr/lib/python2.7/site-packages/osprofiler/profiler.py", line 158, in wrapper
    result = f(*args, **kwargs) 

  File "/usr/lib/python2.7/site-packages/heat/common/context.py", line 409, in wrapped
    return func(self, ctx, *args, **kwargs)

  File "/usr/lib/python2.7/site-packages/heat/engine/service.py", line 2230, in migrate_convergence_1
    st.migrate_to_convergence() 

  File "/usr/lib/python2.7/site-packages/heat/engine/stack.py", line 2150, in migrate_to_convergence
    self.set_resource_deps()

  File "/usr/lib/python2.7/site-packages/heat/engine/stack.py", line 1478, in set_resource_deps
    resource.Resource.set_needed_by(ext_rsrcs_db[r.id], r.needed_by)

TypeError: 'NoneType' object has no attribute '__getitem__'


2018-06-21 09:32:02,788 DEBUG: An exception occurred

(undercloud) [stack@instack ~]$ rpm -qa instack\* python-heat\* openstack-heat\*|sort 
instack-8.1.1-0.20180313084439.0d768a3.el7ost.noarch
instack-undercloud-8.4.1-4.el7ost.noarch
openstack-heat-agents-1.5.4-0.20180308153305.ecf43c7.el7ost.noarch
openstack-heat-api-10.0.1-0.20180411125640.el7ost.noarch
openstack-heat-api-cfn-10.0.1-0.20180411125640.el7ost.noarch
openstack-heat-common-10.0.1-0.20180411125640.el7ost.noarch
openstack-heat-engine-10.0.1-0.20180411125640.el7ost.noarch
python-heat-agent-1.5.4-0.20180308153305.ecf43c7.el7ost.noarch
python-heat-agent-ansible-1.5.4-0.20180308153305.ecf43c7.el7ost.noarch
python-heat-agent-apply-config-1.5.4-0.20180308153305.ecf43c7.el7ost.noarch
python-heat-agent-docker-cmd-1.5.4-0.20180308153305.ecf43c7.el7ost.noarch
python-heat-agent-hiera-1.5.4-0.20180308153305.ecf43c7.el7ost.noarch
python-heat-agent-json-file-1.5.4-0.20180308153305.ecf43c7.el7ost.noarch
python-heat-agent-puppet-1.5.4-0.20180308153305.ecf43c7.el7ost.noarch