Skip to content

Commit 9ad61b1

Browse files
committed
Remove the deprecated DB2 driver
Change-Id: I0718da0d8cd3a63708117d770b1bf21f9ce3bfe1
1 parent 9bf2d37 commit 9ad61b1

13 files changed

+19
-667
lines changed

ceilometer/event/storage/impl_db2.py

-69
This file was deleted.

ceilometer/event/storage/pymongo_base.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
1111
# License for the specific language governing permissions and limitations
1212
# under the License.
13-
"""Common functions for MongoDB and DB2 backends
13+
"""Common functions for MongoDB backend
1414
"""
1515
from oslo_log import log
1616
import pymongo
@@ -35,7 +35,7 @@
3535

3636

3737
class Connection(base.Connection):
38-
"""Base event Connection class for MongoDB and DB2 drivers."""
38+
"""Base event Connection class for MongoDB driver."""
3939
CAPABILITIES = utils.update_nested(base.Connection.CAPABILITIES,
4040
COMMON_AVAILABLE_CAPABILITIES)
4141

ceilometer/storage/__init__.py

-11
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,6 @@
5757
secret=True,
5858
help='The connection string used to connect to the event '
5959
'database. (if unset, connection is used)'),
60-
cfg.IntOpt('db2nosql_resource_id_maxlen',
61-
default=512,
62-
help="The max length of resources id in DB2 nosql, "
63-
"the value should be larger than len(hostname) * 2 "
64-
"as compute node's resource id is <hostname>_<nodename>."),
6560
]
6661

6762
cfg.CONF.register_opts(OPTS, group='database')
@@ -117,12 +112,6 @@ def get_connection(url, namespace):
117112
# SqlAlchemy connections specify may specify a 'dialect' or
118113
# 'dialect+driver'. Handle the case where driver is specified.
119114
engine_name = connection_scheme.split('+')[0]
120-
if engine_name == 'db2':
121-
import warnings
122-
warnings.simplefilter("always")
123-
import debtcollector
124-
debtcollector.deprecate("The DB2nosql driver is no longer supported",
125-
version="Liberty", removal_version="N*-cycle")
126115
# NOTE: translation not applied bug #1446983
127116
LOG.debug('looking for %(name)r driver in %(namespace)r',
128117
{'name': engine_name, 'namespace': namespace})

0 commit comments

Comments
 (0)