xenapi: when using config_drive xenstore metadata is not always injected

[John Garbutt]

Currently, certain code paths in the xenapi drive skip adding metadata when config drive is enabled.

We should really always inject this data, regardless of if config_drive is enabled, because you could also be using the agent.

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/32132

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/32132
Committed: http://github.com/openstack/nova/commit/0107ce638b5c75bf112d74aab62914ffa5033a96
Submitter: Jenkins
Branch: master

commit 0107ce638b5c75bf112d74aab62914ffa5033a96
Author: John Garbutt <email address hidden>
Date: Fri Jun 7 14:30:53 2013 +0100

    xenapi: ensure instance metadata always injected into xenstore

    It is possible to use the agent, cloud-init and config drive
    together on a single server. In this case we should still
    be injecting the instance metadata.

    The current code is inconsistent between spawn and migrations.

    The correct approach is to always inject the data into xenstore.

    fixes bug 1188618

    Change-Id: I253b34234544cff353985a5b53ec084ea332535a