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: Ib17a74ada3122ce45c52fdd7dcf8d27fafbb1d70
This commit is contained in:
parent
505368e524
commit
d797ef81cd
|
@ -18,7 +18,7 @@
|
|||
#
|
||||
|
||||
# Must import this before argparse
|
||||
from oslo.config import cfg
|
||||
from oslo_config import cfg
|
||||
|
||||
import argparse
|
||||
import importlib
|
||||
|
@ -29,7 +29,7 @@ import sys
|
|||
|
||||
import git
|
||||
from lxml import etree
|
||||
import oslo.i18n as i18n
|
||||
import oslo_i18n as i18n
|
||||
import stevedore
|
||||
|
||||
from hooks import HOOKS # noqa
|
||||
|
|
|
@ -19,7 +19,7 @@ import pickle
|
|||
import sys
|
||||
|
||||
from lxml import etree
|
||||
from oslo.config import cfg
|
||||
from oslo_config import cfg
|
||||
|
||||
from autohelp import OptionsCache # noqa
|
||||
|
||||
|
|
|
@ -27,7 +27,7 @@ def keystone_config():
|
|||
def glance_store_config():
|
||||
try:
|
||||
import glance_store
|
||||
from oslo.config import cfg
|
||||
from oslo_config import cfg
|
||||
|
||||
glance_store.backend.register_opts(cfg.CONF)
|
||||
except ImportError:
|
||||
|
@ -40,7 +40,7 @@ def neutron_misc():
|
|||
import networking_cisco.plugins.cisco.cfg_agent.device_status # noqa
|
||||
import networking_l2gw.services.l2gateway.common.config as l2gw
|
||||
import networking_vsphere.common.config
|
||||
from oslo.config import cfg
|
||||
from oslo_config import cfg
|
||||
import vmware_nsx.neutron.plugins.vmware.common.config # noqa
|
||||
|
||||
bsnstacklib.plugins.bigswitch.config.register_config()
|
||||
|
|
|
@ -30,7 +30,7 @@ import socket
|
|||
import sys
|
||||
import textwrap
|
||||
|
||||
from oslo.config import cfg
|
||||
from oslo_config import cfg
|
||||
|
||||
# from openstack.common import gettextutils
|
||||
from openstack.common import importutils
|
||||
|
|
|
@ -43,7 +43,7 @@ import time
|
|||
import urllib2
|
||||
|
||||
from lxml import etree
|
||||
from oslo.config import cfg
|
||||
from oslo_config import cfg
|
||||
|
||||
import os_doc_tools
|
||||
from os_doc_tools.common import check_output # noqa
|
||||
|
|
|
@ -36,7 +36,7 @@ import os
|
|||
import sys
|
||||
import traceback
|
||||
|
||||
from oslo.config import cfg
|
||||
from oslo_config import cfg
|
||||
import six
|
||||
from six import moves
|
||||
|
||||
|
|
Loading…
Reference in New Issue