From 82858a1eeda1618a9b2d08bbb3aae4965dd4ab70 Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Mon, 25 Feb 2013 23:14:01 +0000 Subject: Allow zk driver be imported without zookeeper The zookeeper python module isn't widely available (e.g. not available on Fedora), so allow the zk servicegroup driver be imported even if the module isn't found. This helps allow the generate_sample.sh script generate a sample config file even without zookeeper installed. Change-Id: Ic3b3bb75bcd2003150909ebd2c5724fa5093c346 --- nova/tests/servicegroup/test_zk_driver.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nova/tests') diff --git a/nova/tests/servicegroup/test_zk_driver.py b/nova/tests/servicegroup/test_zk_driver.py index 7330da66a..a33b4b0cd 100644 --- a/nova/tests/servicegroup/test_zk_driver.py +++ b/nova/tests/servicegroup/test_zk_driver.py @@ -38,7 +38,7 @@ class ZKServiceGroupTestCase(test.TestCase): servicegroup.API._driver = None try: from nova.servicegroup.drivers import zk - _unused = zk + _unused = zk.ZooKeeperDriver() except ImportError: self.skipTest("Unable to test due to lack of ZooKeeper") self.flags(servicegroup_driver='zk') -- cgit