From b2247590ae422588db541f279c7b137e36ee836f Mon Sep 17 00:00:00 2001 From: Alvaro Lopez Garcia Date: Mon, 23 Apr 2012 16:40:38 +0200 Subject: Fixes bug 987335. Revert bug introduced by commit a837f92e that removed console_log from get_console_output() Change-Id: I22a14b5f50c2df0486420b38137328ac87844c1f --- nova/virt/libvirt/connection.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/nova/virt/libvirt/connection.py b/nova/virt/libvirt/connection.py index a01d96377..09a0dfe39 100644 --- a/nova/virt/libvirt/connection.py +++ b/nova/virt/libvirt/connection.py @@ -982,6 +982,7 @@ class LibvirtConnection(driver.ComputeDriver): self._chown_console_log_for_instance(instance['name']) data = self._flush_libvirt_console(pty) + console_log = self._get_console_log_path(instance_name) fpath = self._append_to_file(data, console_log) return libvirt_utils.load_file(fpath) @@ -1132,9 +1133,12 @@ class LibvirtConnection(driver.ComputeDriver): libvirt_utils.mkfs('swap', target) @staticmethod - def _chown_console_log_for_instance(instance_name): - console_log = os.path.join(FLAGS.instances_path, instance_name, - 'console.log') + def _get_console_log_path(instance_name): + return os.path.join(FLAGS.instances_path, instance_name, + 'console.log') + + def _chown_console_log_for_instance(self, instance_name): + console_log = self._get_console_log_path(instance_name) if os.path.exists(console_log): libvirt_utils.chown(console_log, os.getuid()) -- cgit