← Back to branch summary

~markmc/nova/flat-dhcp-without-bridge-iface

« back to all changes in this revision

Viewing changes to nova/virt/xenapi/vmops.py

  • Committer: Tarmac
  • Author(s): Christopher MacGown
  • Date: 2011-08-23 06:00:12 UTC
  • mfrom: (1476.1.2 trunk_merge)
  • Revision ID: tarmac-20110823060012-od44a3emqh6he9ud
Implements first-pass of config-drive that adds a vfat format drive to a vm when config_drive is True (or an image id).

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/virt/xenapi/vmops.py
239
239
        self._attach_disks(instance, disk_image_type, vm_ref, first_vdi_ref,
240
240
            vdis)
241
241
 
242
 
        # Alter the image before VM start for, e.g. network injection
243
 
        if FLAGS.flat_injected:
 
242
        # Alter the image before VM start for, e.g. network injection also
 
243
        # alter the image if there's metadata.
 
244
        if FLAGS.flat_injected or instance['metadata']:
244
245
            VMHelper.preconfigure_instance(self._session, instance,
245
246
                                           first_vdi_ref, network_info)
246
247