diff options
| author | Daniel P. Berrange <berrange@redhat.com> | 2012-03-07 12:14:21 -0500 |
|---|---|---|
| committer | Daniel P. Berrange <berrange@redhat.com> | 2012-03-23 19:23:13 +0000 |
| commit | 80b70c6b30d89fe856b4a305cc641ef0dd7a8b80 (patch) | |
| tree | f496302f3aece242be5b8017c14585c0d5a5dd7d | |
| parent | 983ac72be4d57a4108edead00d56a3d189c6d499 (diff) | |
Move NIC devices back after disk devices
Originally the NIC devices were listed in the XML after the
disk devices. Restore that order, simply for consistency.
No functional change.
blueprint libvirt-xml-config-apis
Change-Id: If62446292850d58e133b0c4cc42ca83018e1fca1
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
| -rw-r--r-- | nova/virt/libvirt/connection.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/nova/virt/libvirt/connection.py b/nova/virt/libvirt/connection.py index baba43d3e..e96566cd5 100644 --- a/nova/virt/libvirt/connection.py +++ b/nova/virt/libvirt/connection.py @@ -1370,9 +1370,6 @@ class LibvirtConnection(driver.ComputeDriver): block_device_info) devs = [] - for (network, mapping) in network_info: - cfg = self.vif_driver.plug(instance, network, mapping) - devs.append(cfg.to_xml()) # FIXME(vish): stick this in db inst_type_id = instance['instance_type_id'] @@ -1552,6 +1549,10 @@ class LibvirtConnection(driver.ComputeDriver): diskconfig.target_bus = ephemeral_disk_bus devs.append(diskconfig.to_xml()) + for (network, mapping) in network_info: + cfg = self.vif_driver.plug(instance, network, mapping) + devs.append(cfg.to_xml()) + xml_info = {'type': FLAGS.libvirt_type, 'name': instance['name'], 'uuid': instance['uuid'], |