diff options
| author | Soren Hansen <soren.hansen@rackspace.com> | 2010-09-13 14:20:32 +0200 |
|---|---|---|
| committer | Soren Hansen <soren.hansen@rackspace.com> | 2010-09-13 14:20:32 +0200 |
| commit | 9c4b6612e65d548542b1bf37373200e4e6abc98d (patch) | |
| tree | a00de200347d6fed0519482179ca984359e975f4 | |
| parent | b15bde79b71e474d96674c8eae4108ac9c063731 (diff) | |
| download | nova-9c4b6612e65d548542b1bf37373200e4e6abc98d.tar.gz nova-9c4b6612e65d548542b1bf37373200e4e6abc98d.tar.xz nova-9c4b6612e65d548542b1bf37373200e4e6abc98d.zip | |
Correctly pass ip_address to templates.
| -rw-r--r-- | nova/virt/libvirt.qemu.xml.template | 4 | ||||
| -rw-r--r-- | nova/virt/libvirt.uml.xml.template | 4 | ||||
| -rw-r--r-- | nova/virt/libvirt_conn.py | 4 |
3 files changed, 7 insertions, 5 deletions
diff --git a/nova/virt/libvirt.qemu.xml.template b/nova/virt/libvirt.qemu.xml.template index cbf501f9c..d02aa9114 100644 --- a/nova/virt/libvirt.qemu.xml.template +++ b/nova/virt/libvirt.qemu.xml.template @@ -20,8 +20,8 @@ <source bridge='%(bridge_name)s'/> <mac address='%(mac_address)s'/> <!-- <model type='virtio'/> CANT RUN virtio network right now --> - <filterref filter="nova-instance-$(name)s"> - <parameter name="IP" value="$(private_dns_name)s" /> + <filterref filter="nova-instance-%(name)s"> + <parameter name="IP" value="%(ip_address)s" /> </filterref> </interface> <serial type="file"> diff --git a/nova/virt/libvirt.uml.xml.template b/nova/virt/libvirt.uml.xml.template index 2030b87d2..bf3f2f86a 100644 --- a/nova/virt/libvirt.uml.xml.template +++ b/nova/virt/libvirt.uml.xml.template @@ -14,8 +14,8 @@ <interface type='bridge'> <source bridge='%(bridge_name)s'/> <mac address='%(mac_address)s'/> - <filterref filter="nova-instance-$(name)s"> - <parameter name="IP" value="$(private_dns_name)s" /> + <filterref filter="nova-instance-%(name)s"> + <parameter name="IP" value="%(ip_address)s" /> </filterref> </interface> <console type="file"> diff --git a/nova/virt/libvirt_conn.py b/nova/virt/libvirt_conn.py index 2e1dfcefc..00a80989f 100644 --- a/nova/virt/libvirt_conn.py +++ b/nova/virt/libvirt_conn.py @@ -322,6 +322,7 @@ class LibvirtConnection(object): network = db.project_get_network(None, instance['project_id']) # FIXME(vish): stick this in db instance_type = instance_types.INSTANCE_TYPES[instance['instance_type']] + ip_address = db.instance_get_fixed_address({}, instance['id']) xml_info = {'type': FLAGS.libvirt_type, 'name': instance['name'], 'basepath': os.path.join(FLAGS.instances_path, @@ -329,7 +330,8 @@ class LibvirtConnection(object): 'memory_kb': instance_type['memory_mb'] * 1024, 'vcpus': instance_type['vcpus'], 'bridge_name': network['bridge'], - 'mac_address': instance['mac_address']} + 'mac_address': instance['mac_address'], + 'ip_address': ip_address } libvirt_xml = self.libvirt_xml % xml_info logging.debug('instance %s: finished toXML method', instance['name']) |