summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoe Gordon <jogo@cloudscaling.com>2013-02-18 11:13:01 -0800
committerJoe Gordon <jogo@cloudscaling.com>2013-02-18 14:23:04 -0800
commitb1da6f71247c49f96044a0b9d9c8331fb0d21254 (patch)
treeca5ce25cfd171ff86a17056258179927e1beef08
parent9e2b990f2260dbbe1b207e853b37f6261e594fbd (diff)
Do not use abbreviated config group names (zookeeper)
Using abbreviated config group names just makes the config file harder to understand, so just use full name. zk => zookeeper Change-Id: Ia8b3ff9201365477003535600e419540deae7341
-rw-r--r--nova/servicegroup/drivers/zk.py2
-rw-r--r--nova/tests/servicegroup/test_zk_driver.py2
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()