summaryrefslogtreecommitdiffstats
path: root/nova/openstack
diff options
context:
space:
mode:
authorRussell Bryant <rbryant@redhat.com>2012-04-02 17:44:22 -0400
committerRussell Bryant <rbryant@redhat.com>2012-04-02 17:44:22 -0400
commitf83d60b2e4f29be7b0fb69baada59645b4b72668 (patch)
treecfcd917c0ee04340e1cb3eeed4f4495fa5a753ef /nova/openstack
parenta8aa3ffdeb4d171ec8b7b07472ed9008df1efb75 (diff)
downloadnova-f83d60b2e4f29be7b0fb69baada59645b4b72668.tar.gz
nova-f83d60b2e4f29be7b0fb69baada59645b4b72668.tar.xz
nova-f83d60b2e4f29be7b0fb69baada59645b4b72668.zip
Sync openstack.common.cfg from openstack-common.
Change-Id: I54c7afc1c20f5fbec02dc879f7a753d07adfb5db
Diffstat (limited to 'nova/openstack')
-rw-r--r--nova/openstack/common/cfg.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/nova/openstack/common/cfg.py b/nova/openstack/common/cfg.py
index 7adf3b472..495c2aff0 100644
--- a/nova/openstack/common/cfg.py
+++ b/nova/openstack/common/cfg.py
@@ -128,8 +128,8 @@ manager e.g.::
Options can be registered as belonging to a group::
- rabbit_group = cfg.OptionGroup(name='rabbit',
- title='RabbitMQ options')
+ rabbit_group = cfg.OptGroup(name='rabbit',
+ title='RabbitMQ options')
rabbit_host_opt = cfg.StrOpt('host',
default='localhost',
@@ -226,7 +226,7 @@ import os
import string
import sys
-import iniparser
+from nova.openstack.common import iniparser
class Error(Exception):