Merge "Remove the deprecated DB2 driver"

ceilometer/event/storage/pymongo_base.py

@@ -10,7 +10,7 @@
 # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 # License for the specific language governing permissions and limitations
 # under the License.
-"""Common functions for MongoDB and DB2 backends
+"""Common functions for MongoDB backend
 """
 from oslo_log import log
 import pymongo
@@ -35,7 +35,7 @@
 
 
 class Connection(base.Connection):
-    """Base event Connection class for MongoDB and DB2 drivers."""
+    """Base event Connection class for MongoDB driver."""
     CAPABILITIES = utils.update_nested(base.Connection.CAPABILITIES,
                                        COMMON_AVAILABLE_CAPABILITIES)
 

ceilometer/storage/__init__.py

@@ -57,11 +57,6 @@
                secret=True,
                help='The connection string used to connect to the event '
                'database. (if unset, connection is used)'),
-    cfg.IntOpt('db2nosql_resource_id_maxlen',
-               default=512,
-               help="The max length of resources id in DB2 nosql, "
-                    "the value should be larger than len(hostname) * 2 "
-                    "as compute node's resource id is <hostname>_<nodename>."),
 ]
 
 cfg.CONF.register_opts(OPTS, group='database')
@@ -117,12 +112,6 @@ def get_connection(url, namespace):
     # SqlAlchemy connections specify may specify a 'dialect' or
     # 'dialect+driver'. Handle the case where driver is specified.
     engine_name = connection_scheme.split('+')[0]
-    if engine_name == 'db2':
-        import warnings
-        warnings.simplefilter("always")
-        import debtcollector
-        debtcollector.deprecate("The DB2nosql driver is no longer supported",
-                                version="Liberty", removal_version="N*-cycle")
     # NOTE: translation not applied bug #1446983
     LOG.debug('looking for %(name)r driver in %(namespace)r',
               {'name': engine_name, 'namespace': namespace})