diff options
| author | Brian Waldon <brian.waldon@rackspace.com> | 2011-05-02 16:27:58 -0400 |
|---|---|---|
| committer | Brian Waldon <brian.waldon@rackspace.com> | 2011-05-02 16:27:58 -0400 |
| commit | 8d9e8ea5ddfaa2ca9e405960654ee6f6b0bab8bb (patch) | |
| tree | 31bf1b04ae967021a76c0e4f2c3389eee5682b3a /nova/virt | |
| parent | 89d818c621cf257495ceb07687be04152423086a (diff) | |
| parent | 65f05c403e852cebeb7b052e36bbd129aedf4d4f (diff) | |
merging trunk; resolving conflicts; fixing issue with ApiError test failing since r1043
Diffstat (limited to 'nova/virt')
| -rw-r--r-- | nova/virt/libvirt_conn.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/nova/virt/libvirt_conn.py b/nova/virt/libvirt_conn.py index 46643ce73..9780c69a6 100644 --- a/nova/virt/libvirt_conn.py +++ b/nova/virt/libvirt_conn.py @@ -735,6 +735,9 @@ class LibvirtConnection(driver.ComputeDriver): subprocess.Popen(cmd, shell=True) return {'token': token, 'host': host, 'port': port} + def get_host_ip_addr(self): + return FLAGS.my_ip + @exception.wrap_exception def get_vnc_console(self, instance): def get_vnc_port_for_instance(instance_name): |