From efeb69f9033a57a1c806f71ee3ed9fd3f4d2475e Mon Sep 17 00:00:00 2001
From: Flavio Percoco <flaper87@gmail.com>
Date: Thu, 26 Feb 2015 22:11:57 +0100
Subject: [PATCH] Remove deprecated option db_enforce_mysql_charset

As per the config option docstring, the option was supposed to have been
removed back in Juno. Removing now.

DocImpact

Change-Id: If2ac2fd38cc1ea5e3ed3d4fdb8eb97e13bcb93c8
---
 etc/glance-manage.conf         |  7 -------
 glance/common/config.py        | 11 -----------
 glance/opts.py                 |  3 +--
 glance/tests/unit/test_opts.py |  1 -
 4 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/etc/glance-manage.conf b/etc/glance-manage.conf
index f23b38233a..42d2880c1d 100644
--- a/etc/glance-manage.conf
+++ b/etc/glance-manage.conf
@@ -4,13 +4,6 @@
 # From glance.manage
 #
 
-# DEPRECATED. TO BE REMOVED IN THE JUNO RELEASE. Whether or not to
-# enforce that all DB tables have charset utf8. If your database
-# tables do not have charset utf8 you will need to convert before this
-# option is removed. This option is only relevant if your database
-# engine is MySQL. (boolean value)
-#db_enforce_mysql_charset = true
-
 # Print debugging output (set logging level to DEBUG instead of
 # default WARNING level). (boolean value)
 #debug = false
diff --git a/glance/common/config.py b/glance/common/config.py
index 005c54585e..59aeebba87 100644
--- a/glance/common/config.py
+++ b/glance/common/config.py
@@ -91,16 +91,6 @@ task_opts = [
                       'based on the worst case scenario and be prepared to '
                       'act in case they were wrong.')),
 ]
-manage_opts = [
-    cfg.BoolOpt('db_enforce_mysql_charset',
-                default=True,
-                help=_('DEPRECATED. TO BE REMOVED IN THE JUNO RELEASE. '
-                       'Whether or not to enforce that all DB tables have '
-                       'charset utf8. If your database tables do not have '
-                       'charset utf8 you will need to convert before this '
-                       'option is removed. This option is only relevant if '
-                       'your database engine is MySQL.'))
-]
 common_opts = [
     cfg.BoolOpt('allow_additional_image_properties', default=True,
                 help=_('Whether to allow users to specify image properties '
@@ -189,7 +179,6 @@ CONF = cfg.CONF
 CONF.register_opts(paste_deploy_opts, group='paste_deploy')
 CONF.register_opts(image_format_opts, group='image_format')
 CONF.register_opts(task_opts, group='task')
-CONF.register_opts(manage_opts)
 CONF.register_opts(common_opts)
 
 
diff --git a/glance/opts.py b/glance/opts.py
index 653f9e6527..e8a72e0949 100644
--- a/glance/opts.py
+++ b/glance/opts.py
@@ -97,8 +97,7 @@ _cache_opts = [
         glance.registry.client.registry_client_ctx_opts))),
 ]
 _manage_opts = [
-    (None, list(itertools.chain(
-        glance.common.config.manage_opts)))
+    (None, [])
 ]
 
 
diff --git a/glance/tests/unit/test_opts.py b/glance/tests/unit/test_opts.py
index 7b516c9e49..e899d644e8 100644
--- a/glance/tests/unit/test_opts.py
+++ b/glance/tests/unit/test_opts.py
@@ -305,7 +305,6 @@ class OptsTestCase(utils.BaseTestCase):
             None,
         ]
         expected_opt_names = [
-            'db_enforce_mysql_charset'
         ]
 
         self._check_opt_groups(opt_list, expected_opt_groups)