From 4a41f0b3e59b5f8b404e6a9e196466e0893657da Mon Sep 17 00:00:00 2001 From: Doug Hellmann Date: Wed, 6 May 2015 18:45:17 +0000 Subject: [PATCH] Drop use of 'oslo' namespace package The Oslo libraries have moved all of their code out of the 'oslo' namespace package into per-library packages. The namespace package was retained during kilo for backwards compatibility, but will be removed by the liberty-2 milestone. This change removes the use of the namespace package, replacing it with the new package names. The patches in the libraries will be put on hold until application patches have landed, or L2, whichever comes first. At that point, new versions of the libraries without namespace packages will be released as a major version update. Please merge this patch, or an equivalent, before L2 to avoid problems with those library releases. Blueprint: remove-namespace-packages https://blueprints.launchpad.net/oslo-incubator/+spec/remove-namespace-packages Change-Id: If51059c31c82d5235e2ae21143911b5561783ca6 --- os_collect_config/cache.py | 2 +- os_collect_config/cfn.py | 2 +- os_collect_config/collect.py | 2 +- os_collect_config/ec2.py | 2 +- os_collect_config/heat.py | 2 +- os_collect_config/heat_local.py | 2 +- os_collect_config/keystone.py | 2 +- os_collect_config/local.py | 2 +- os_collect_config/openstack/common/log.py | 2 +- os_collect_config/request.py | 2 +- os_collect_config/tests/test_cfn.py | 2 +- os_collect_config/tests/test_collect.py | 2 +- os_collect_config/tests/test_heat.py | 2 +- os_collect_config/tests/test_heat_local.py | 2 +- os_collect_config/tests/test_keystone.py | 2 +- os_collect_config/tests/test_local.py | 2 +- os_collect_config/tests/test_request.py | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/os_collect_config/cache.py b/os_collect_config/cache.py index c07e94c..fc5a23f 100644 --- a/os_collect_config/cache.py +++ b/os_collect_config/cache.py @@ -30,7 +30,7 @@ import os import shutil import tempfile -from oslo.config import cfg +from oslo_config import cfg def get_path(name): diff --git a/os_collect_config/cfn.py b/os_collect_config/cfn.py index 4567659..33f7284 100644 --- a/os_collect_config/cfn.py +++ b/os_collect_config/cfn.py @@ -18,7 +18,7 @@ import os from keystoneclient.contrib.ec2 import utils as ec2_utils from lxml import etree -from oslo.config import cfg +from oslo_config import cfg import six.moves.urllib.parse as urlparse from os_collect_config import common diff --git a/os_collect_config/collect.py b/os_collect_config/collect.py index dcfa0f6..b0082aa 100644 --- a/os_collect_config/collect.py +++ b/os_collect_config/collect.py @@ -22,7 +22,7 @@ import subprocess import sys import time -from oslo.config import cfg +from oslo_config import cfg from os_collect_config import cache from os_collect_config import cfn diff --git a/os_collect_config/ec2.py b/os_collect_config/ec2.py index eeefcc2..7f92847 100644 --- a/os_collect_config/ec2.py +++ b/os_collect_config/ec2.py @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from oslo.config import cfg +from oslo_config import cfg from os_collect_config import common from os_collect_config import exc diff --git a/os_collect_config/heat.py b/os_collect_config/heat.py index f003104..abc212b 100644 --- a/os_collect_config/heat.py +++ b/os_collect_config/heat.py @@ -14,7 +14,7 @@ from heatclient import client as heatclient from keystoneclient.v3 import client as keystoneclient -from oslo.config import cfg +from oslo_config import cfg from os_collect_config import exc from os_collect_config import keystone diff --git a/os_collect_config/heat_local.py b/os_collect_config/heat_local.py index 06981fd..099bdc2 100644 --- a/os_collect_config/heat_local.py +++ b/os_collect_config/heat_local.py @@ -16,7 +16,7 @@ import json import os -from oslo.config import cfg +from oslo_config import cfg from os_collect_config import exc from os_collect_config.openstack.common import log diff --git a/os_collect_config/keystone.py b/os_collect_config/keystone.py index 302abb4..ff68dcb 100644 --- a/os_collect_config/keystone.py +++ b/os_collect_config/keystone.py @@ -19,7 +19,7 @@ from dogpile import cache from keystoneclient import discover as ks_discover from keystoneclient import exceptions as ks_exc from keystoneclient.v3 import client as ks_keystoneclient -from oslo.config import cfg +from oslo_config import cfg CONF = cfg.CONF diff --git a/os_collect_config/local.py b/os_collect_config/local.py index e7bf578..a06bd94 100644 --- a/os_collect_config/local.py +++ b/os_collect_config/local.py @@ -18,7 +18,7 @@ import locale import os import stat -from oslo.config import cfg +from oslo_config import cfg from os_collect_config import exc from os_collect_config.openstack.common import log diff --git a/os_collect_config/openstack/common/log.py b/os_collect_config/openstack/common/log.py index 724abf1..b0d4f4d 100644 --- a/os_collect_config/openstack/common/log.py +++ b/os_collect_config/openstack/common/log.py @@ -37,7 +37,7 @@ import socket import sys import traceback -from oslo.config import cfg +from oslo_config import cfg import six from six import moves diff --git a/os_collect_config/request.py b/os_collect_config/request.py index 5910ee4..36f3b8f 100644 --- a/os_collect_config/request.py +++ b/os_collect_config/request.py @@ -17,7 +17,7 @@ import calendar import json import time -from oslo.config import cfg +from oslo_config import cfg from os_collect_config import common from os_collect_config import exc diff --git a/os_collect_config/tests/test_cfn.py b/os_collect_config/tests/test_cfn.py index 039bdd9..600ffc1 100644 --- a/os_collect_config/tests/test_cfn.py +++ b/os_collect_config/tests/test_cfn.py @@ -18,7 +18,7 @@ import tempfile import fixtures from lxml import etree -from oslo.config import cfg +from oslo_config import cfg import requests import six.moves.urllib.parse as urlparse import testtools diff --git a/os_collect_config/tests/test_collect.py b/os_collect_config/tests/test_collect.py index 4efcff8..6653cab 100644 --- a/os_collect_config/tests/test_collect.py +++ b/os_collect_config/tests/test_collect.py @@ -24,7 +24,7 @@ import extras import fixtures from keystoneclient import discover as ks_discover import mock -from oslo.config import cfg +from oslo_config import cfg import testtools from testtools import matchers diff --git a/os_collect_config/tests/test_heat.py b/os_collect_config/tests/test_heat.py index 92f731d..8f174ef 100644 --- a/os_collect_config/tests/test_heat.py +++ b/os_collect_config/tests/test_heat.py @@ -16,7 +16,7 @@ import fixtures from keystoneclient import discover as ks_discover from keystoneclient import exceptions as ks_exc import mock -from oslo.config import cfg +from oslo_config import cfg import testtools from testtools import matchers diff --git a/os_collect_config/tests/test_heat_local.py b/os_collect_config/tests/test_heat_local.py index 4ae3041..bab62ca 100644 --- a/os_collect_config/tests/test_heat_local.py +++ b/os_collect_config/tests/test_heat_local.py @@ -18,7 +18,7 @@ import os.path import tempfile import fixtures -from oslo.config import cfg +from oslo_config import cfg import testtools from testtools import matchers diff --git a/os_collect_config/tests/test_keystone.py b/os_collect_config/tests/test_keystone.py index 59bbc88..24a4571 100644 --- a/os_collect_config/tests/test_keystone.py +++ b/os_collect_config/tests/test_keystone.py @@ -18,7 +18,7 @@ import fixtures from keystoneclient import discover as ks_discover from keystoneclient import exceptions as ks_exc import mock -from oslo.config import cfg +from oslo_config import cfg import testtools from os_collect_config import collect diff --git a/os_collect_config/tests/test_local.py b/os_collect_config/tests/test_local.py index 37f2ade..d0b5a72 100644 --- a/os_collect_config/tests/test_local.py +++ b/os_collect_config/tests/test_local.py @@ -19,7 +19,7 @@ import os import tempfile import fixtures -from oslo.config import cfg +from oslo_config import cfg import testtools from testtools import matchers diff --git a/os_collect_config/tests/test_request.py b/os_collect_config/tests/test_request.py index a48f969..4a6388c 100644 --- a/os_collect_config/tests/test_request.py +++ b/os_collect_config/tests/test_request.py @@ -18,7 +18,7 @@ import json import time import fixtures -from oslo.config import cfg +from oslo_config import cfg import requests import testtools from testtools import matchers