Merge "Config options: centralize section "ssl""

etc/nova/nova-config-generator.conf

@@ -16,7 +16,6 @@ namespace = oslo.messaging
 namespace = oslo.policy
 namespace = oslo.service.periodic_task
 namespace = oslo.service.service
-namespace = oslo.service.sslutils
 namespace = oslo.db
 namespace = oslo.middleware
 namespace = oslo.concurrency

nova/conf/__init__.py

@@ -73,7 +73,7 @@ from nova.conf import scheduler
 from nova.conf import serial_console
 from nova.conf import service
 from nova.conf import spice
-# from nova.conf import ssl
+from nova.conf import ssl
 # from nova.conf import trusted_computing
 from nova.conf import upgrade_levels
 from nova.conf import virt
@@ -141,7 +141,7 @@ scheduler.register_opts(CONF)
 serial_console.register_opts(CONF)
 service.register_opts(CONF)
 spice.register_opts(CONF)
-# ssl.register_opts(CONF)
+ssl.register_opts(CONF)
 # trusted_computing.register_opts(CONF)
 upgrade_levels.register_opts(CONF)
 virt.register_opts(CONF)

nova/conf/ssl.py

@@ -0,0 +1,24 @@
+# Copyright 2016 OpenStack Foundation
+# All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+from oslo_service import sslutils
+
+
+def register_opts(conf):
+    sslutils.register_opts(conf)
+
+
+def list_opts():
+    return sslutils.list_opts()

nova/tests/unit/image/test_glance.py

@@ -21,7 +21,6 @@ import cryptography
 import glanceclient.exc
 import mock
 
-from oslo_service import sslutils
 import six
 import testtools
 
@@ -412,7 +411,6 @@ class TestGlanceClientWrapper(test.NoDBTestCase):
     @mock.patch('glanceclient.Client')
     def test_create_glance_client_with_ssl(self, client_mock,
                                            ssl_enable_mock):
-        sslutils.register_opts(CONF)
         self.flags(ca_file='foo.cert', cert_file='bar.cert',
                    key_file='wut.key', group='ssl')
         ctxt = mock.sentinel.ctx