commit c9d73809d55ef86eea8d631529882272e00b3fc3
author Jenkins <jenkins@review.openstack.org> Sat Sep 06 17:02:47 2014 +0000
committer Gerrit Code Review <review@openstack.org> Sat Sep 06 17:02:47 2014 +0000
tree 5f89637102b3bc0378bbcb0627219f13b0aaf504
parent 20b46dc9bb11215a9e131886d477a91251c4ee65
parent 42a3f3a83f4f5ee0c8a32faf4a593134f7d6e4bd

Merge "Only log console log if nova supports consoles"

tempest/scenario/manager.py

diff --git a/tempest/scenario/manager.py b/tempest/scenario/manager.py
index 18dc320..8f1a61d 100644
--- a/tempest/scenario/manager.py
+++ b/tempest/scenario/manager.py
@@ -398,6 +398,9 @@
         LOG.debug("image:%s" % self.image)
 
     def _log_console_output(self, servers=None):
+        if not CONF.compute_feature_enabled.console_output:
+            LOG.debug('Console output not supported, cannot log')
+            return
         if not servers:
             _, servers = self.servers_client.list_servers()
             servers = servers['servers']