VMware: vmrescue broken when config drive is used

[Gary Kotton]

Traceback (most recent call last):
File "/opt/stack/nova/nova/compute/manager.py", line 2727, in rescue_instance
rescue_image_meta, admin_password)
File "/opt/stack/nova/nova/virt/vmwareapi/driver.py", line 688, in rescue
_vmops.rescue(context, instance, network_info, image_meta)
File "/opt/stack/nova/nova/virt/vmwareapi/vmops.py", line 1026, in rescue
None, None, network_info)
File "/opt/stack/nova/nova/virt/vmwareapi/vmops.py", line 523, in spawn
cookies)
File "/opt/stack/nova/nova/virt/vmwareapi/vmops.py", line 566, in _create_config_drive
extra_md=extra_md)
File "/opt/stack/nova/nova/api/metadata/base.py", line 145, in __init__
obj_base.obj_to_primitive(instance))
File "/opt/stack/nova/nova/conductor/api.py", line 302, in get_ec2_ids
return self._manager.get_ec2_ids(context, instance)
File "/opt/stack/nova/nova/conductor/rpcapi.py", line 456, in get_ec2_ids
instance=instance_p)
File "/opt/stack/nova/nova/rpcclient.py", line 85, in call
return self._invoke(self.proxy.call, ctxt, method, **kwargs)
File "/opt/stack/nova/nova/rpcclient.py", line 63, in _invoke
return cast_or_call(ctxt, msg, **self.kwargs)
File "/opt/stack/nova/nova/openstack/common/rpc/proxy.py", line 126, in call
result = rpc.call(context, real_topic, msg, timeout)
File "/opt/stack/nova/nova/openstack/common/rpc/__init__.py", line 139, in call
return _get_impl().call(CONF, context, topic, msg, timeout)
File "/opt/stack/nova/nova/openstack/common/rpc/impl_kombu.py", line 816, in call
rpc_amqp.get_connection_pool(conf, Connection))
File "/opt/stack/nova/nova/openstack/common/rpc/amqp.py", line 574, in call
rv = list(rv)
File "/opt/stack/nova/nova/openstack/common/rpc/amqp.py", line 539, in __iter__
raise result
ValueError: invalid literal for int() with base 10: 'bd915bb5-6cae-4d8d-8755-3f6583713eff-rescue'
Traceback (most recent call last):

File "/opt/stack/nova/nova/openstack/common/rpc/amqp.py", line 461, in _process_data
**args)

File "/opt/stack/nova/nova/openstack/common/rpc/dispatcher.py", line 172, in dispatch
result = getattr(proxyobj, method)(ctxt, **kwargs)

File "/opt/stack/nova/nova/conductor/manager.py", line 521, in get_ec2_ids
ec2_ids['instance-id'] = ec2utils.id_to_ec2_inst_id(instance['uuid'])

File "/opt/stack/nova/nova/api/ec2/ec2utils.py", line 193, in id_to_ec2_inst_id
return id_to_ec2_id(instance_id)

File "/opt/stack/nova/nova/api/ec2/ec2utils.py", line 181, in id_to_ec2_id
return template % int(instance_id)

ValueError: invalid literal for int() with base 10: 'bd915bb5-6cae-4d8d-8755-3f6583713eff-rescue'

[Gary Kotton (garyk)]

https://review.openstack.org/#/c/55038/

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/55038
Committed: https://git.openstack.org/cgit/openstack/nova/commit/?id=88861df2b95a9c66a1a9d1969ad9e560786bb848
Submitter: Jenkins
Branch: master

commit 88861df2b95a9c66a1a9d1969ad9e560786bb848
Author: Gary Kotton <email address hidden>
Date: Sat Nov 2 10:13:54 2013 -0700

    VMware: bug fix for VM rescue when config drive is configured

    The addition of the config drive feature broke the VM rescue. The
    cause of the problem was setting the instance UUID to the name of
    the rescue instance. This must be a UUID! The solution
    is to pass the instance name to the spawn method instead of writing
    this on the instance UUID.

    Change-Id: Ia8494b0c8099753b666bda18a19c4c9a3f764616
    Closes-bug: #1247427

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/havana
Review: https://review.openstack.org/68729

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/68729
Committed: https://git.openstack.org/cgit/openstack/nova/commit/?id=17445aa7f2ce92fba877b7f6948770cf61c5ff81
Submitter: Jenkins
Branch: stable/havana

commit 17445aa7f2ce92fba877b7f6948770cf61c5ff81
Author: Gary Kotton <email address hidden>
Date: Sat Nov 2 10:13:54 2013 -0700

    VMware: bug fix for VM rescue when config drive is configured

    The addition of the config drive feature broke the VM rescue. The
    cause of the problem was setting the instance UUID to the name of
    the rescue instance. This must be a UUID! The solution
    is to pass the instance name to the spawn method instead of writing
    this on the instance UUID.

    Closes-bug: #1247427

    Conflicts:

     nova/virt/vmwareapi/vmops.py

    Change-Id: Ia8494b0c8099753b666bda18a19c4c9a3f764616
    (cherry picked from commit 88861df2b95a9c66a1a9d1969ad9e560786bb848)