summaryrefslogtreecommitdiffstats
path: root/keystone
diff options
context:
space:
mode:
authorMark McLoughlin <markmc@redhat.com>2012-02-22 21:04:11 +0000
committerMark McLoughlin <markmc@redhat.com>2012-02-23 06:20:40 +0000
commitd679baf883a74e0fae25e5657f4d7d58d359a05b (patch)
tree8865b5676c7a8ecdd906082a61b2e1f4c5e7f136 /keystone
parent45d6aa1870bd81e451cba46c6b2c0c3801f68d6e (diff)
downloadkeystone-d679baf883a74e0fae25e5657f4d7d58d359a05b.tar.gz
keystone-d679baf883a74e0fae25e5657f4d7d58d359a05b.tar.xz
keystone-d679baf883a74e0fae25e5657f4d7d58d359a05b.zip
Move cfg to keystone.openstack.common
Just code movement here, no changes. This is so we can use openstack-common's update script to keep it in sync. See: http://wiki.openstack.org/CommonLibrary#Incubation Change-Id: Ieb8ce50071a85987152b995fa6773433b7671c48
Diffstat (limited to 'keystone')
-rw-r--r--keystone/config.py2
-rw-r--r--keystone/openstack/__init__.py0
-rw-r--r--keystone/openstack/common/__init__.py0
-rw-r--r--keystone/openstack/common/cfg.py (renamed from keystone/common/cfg.py)0
4 files changed, 1 insertions, 1 deletions
diff --git a/keystone/config.py b/keystone/config.py
index 5247c67e..3b1bcab2 100644
--- a/keystone/config.py
+++ b/keystone/config.py
@@ -18,8 +18,8 @@ import gettext
import sys
import os
-from keystone.common import cfg
from keystone.common import logging
+from keystone.openstack.common import cfg
gettext.install('keystone', unicode=1)
diff --git a/keystone/openstack/__init__.py b/keystone/openstack/__init__.py
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/keystone/openstack/__init__.py
diff --git a/keystone/openstack/common/__init__.py b/keystone/openstack/common/__init__.py
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/keystone/openstack/common/__init__.py
diff --git a/keystone/common/cfg.py b/keystone/openstack/common/cfg.py
index cd0a2a0f..cd0a2a0f 100644
--- a/keystone/common/cfg.py
+++ b/keystone/openstack/common/cfg.py