diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-02-19 07:08:48 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-02-19 07:08:48 +0000 |
| commit | 749d7a3a2f3595d629ac494fb71a3d060fff29c5 (patch) | |
| tree | 5f0237ff53399169071c45a6516bf3c3c6d8eab2 | |
| parent | 49ead390863c2dc0efea766a42d768432d9dfae7 (diff) | |
| parent | b1da6f71247c49f96044a0b9d9c8331fb0d21254 (diff) | |
Merge "Do not use abbreviated config group names (zookeeper)"
| -rw-r--r-- | nova/servicegroup/drivers/zk.py | 2 | ||||
| -rw-r--r-- | nova/tests/servicegroup/test_zk_driver.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nova/servicegroup/drivers/zk.py b/nova/servicegroup/drivers/zk.py index c4e3f7b71..6a98d6dc3 100644 --- a/nova/servicegroup/drivers/zk.py +++ b/nova/servicegroup/drivers/zk.py @@ -48,7 +48,7 @@ zk_driver_opts = [ ] CONF = cfg.CONF -CONF.register_opts(zk_driver_opts, group="zk") +CONF.register_opts(zk_driver_opts, group="zookeeper") LOG = logging.getLogger(__name__) diff --git a/nova/tests/servicegroup/test_zk_driver.py b/nova/tests/servicegroup/test_zk_driver.py index 753153bb5..7330da66a 100644 --- a/nova/tests/servicegroup/test_zk_driver.py +++ b/nova/tests/servicegroup/test_zk_driver.py @@ -42,7 +42,7 @@ class ZKServiceGroupTestCase(test.TestCase): except ImportError: self.skipTest("Unable to test due to lack of ZooKeeper") self.flags(servicegroup_driver='zk') - self.flags(address='localhost:2181', group="zk") + self.flags(address='localhost:2181', group="zookeeper") def test_join_leave(self): self.servicegroup_api = servicegroup.API() |