summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2011-11-12 17:53:58 +0000
committerGerrit Code Review <review@openstack.org>2011-11-12 17:53:58 +0000
commit1851662edb870534a73e86cc3aa475b305ee8ebc (patch)
tree976fa7101ba9849b84f2559c31a7b06d711d21f3
parent165cbc3942c5fac4d969e8a094dc4b5e555f6110 (diff)
parent1ecd70f23ae211c5c4ea5613adc24c0e1557790d (diff)
Merge "Bug #887805 Error during report_driver_status(): 'LibvirtConnection' object has no attribute '_host_state'"
-rw-r--r--.mailmap1
-rw-r--r--Authors2
-rw-r--r--nova/virt/libvirt/connection.py3
3 files changed, 4 insertions, 2 deletions
diff --git a/.mailmap b/.mailmap
index 735615afe..98a3f3132 100644
--- a/.mailmap
+++ b/.mailmap
@@ -18,6 +18,7 @@
<dan@nicira.com> <danwent@dan-xs3-cs>
<dan@nicira.com> <danwent@gmail.com>
<devin.carlen@gmail.com> <devcamcar@illian.local>
+<edouard1.thuleau@orange.com> <thuleau@gmail.com>
<ewan.mellor@citrix.com> <emellor@silver>
<itoumsn@nttdata.co.jp> <itoumsn@shayol>
<jake@ansolabs.com> <jake@markupisart.com>
diff --git a/Authors b/Authors
index 47288c9ed..36ec620cd 100644
--- a/Authors
+++ b/Authors
@@ -40,7 +40,7 @@ Devendra Modium <dmodium@isi.edu>
Devin Carlen <devin.carlen@gmail.com>
Donal Lafferty <donal.lafferty@citrix.com>
Ed Leafe <ed@leafe.com>
-Edouard Thuleau <thuleau@gmail.com>
+Edouard Thuleau <edouard1.thuleau@orange.com>
Eldar Nugaev <reldan@oscloud.ru>
Eric Day <eday@oddments.org>
Eric Windisch <eric@cloudscaling.com>
diff --git a/nova/virt/libvirt/connection.py b/nova/virt/libvirt/connection.py
index fc03ea67b..fb7f71ad1 100644
--- a/nova/virt/libvirt/connection.py
+++ b/nova/virt/libvirt/connection.py
@@ -191,11 +191,12 @@ class LibvirtConnection(driver.ComputeDriver):
driver_type, _sep, driver = driver_str.partition('=')
driver_class = utils.import_class(driver)
self.volume_drivers[driver_type] = driver_class(self)
+ self._host_state = None
@property
def host_state(self):
if not self._host_state:
- self._host_state = HostState(self._session)
+ self._host_state = HostState(self.read_only)
return self._host_state
def init_host(self, host):