conf: Remove 'nova.crypto' opts

These are no longer used since [1] and can be immediately removed
without a deprecation cycle.

[1] Ie1dadc6bf935f777e0cd0c54a0a21b79545714c5

Change-Id: I53aa27ff0c3e8a7a2d5bbfa338bdae59002f6e9d
This commit is contained in:
Stephen Finucane 2018-03-08 10:08:16 +00:00
parent 44935e9bc2
commit a869b9c790
3 changed files with 16 additions and 113 deletions

View File

@ -30,7 +30,6 @@ from nova.conf import conductor
from nova.conf import configdrive
from nova.conf import console
from nova.conf import consoleauth
from nova.conf import crypto
from nova.conf import database
from nova.conf import devices
from nova.conf import ephemeral_storage
@ -83,7 +82,6 @@ conductor.register_opts(CONF)
configdrive.register_opts(CONF)
console.register_opts(CONF)
consoleauth.register_opts(CONF)
crypto.register_opts(CONF)
database.register_opts(CONF)
devices.register_opts(CONF)
ephemeral_storage.register_opts(CONF)

View File

@ -1,111 +0,0 @@
# 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.
import os
from oslo_config import cfg
from nova.conf import paths
crypto_opts_group = cfg.OptGroup("crypto",
title="Crypto Options")
crypto_opts = [
cfg.StrOpt("ca_file",
default="cacert.pem",
deprecated_group="DEFAULT",
help="""
Filename of root CA (Certificate Authority). This is a container format
and includes root certificates.
Possible values:
* Any file name containing root CA, cacert.pem is default
Related options:
* ca_path
"""),
cfg.StrOpt("key_file",
default=os.path.join("private", "cakey.pem"),
deprecated_group="DEFAULT",
help="""
Filename of a private key.
Related options:
* keys_path
"""),
cfg.StrOpt("crl_file",
default="crl.pem",
deprecated_group="DEFAULT",
help="""
Filename of root Certificate Revocation List (CRL). This is a list of
certificates that have been revoked, and therefore, entities presenting
those (revoked) certificates should no longer be trusted.
Related options:
* ca_path
"""),
cfg.StrOpt("keys_path",
default=paths.state_path_def("keys"),
deprecated_group="DEFAULT",
help="""
Directory path where keys are located.
Related options:
* key_file
"""),
cfg.StrOpt("ca_path",
default=paths.state_path_def("CA"),
deprecated_group="DEFAULT",
help="""
Directory path where root CA is located.
Related options:
* ca_file
"""),
cfg.BoolOpt("use_project_ca",
default=False,
deprecated_group="DEFAULT",
help="Option to enable/disable use of CA for each project."),
cfg.StrOpt("user_cert_subject",
default="/C=US/ST=California/O=OpenStack/"
"OU=NovaDev/CN=%.16s-%.16s-%s",
deprecated_group="DEFAULT",
help="""
Subject for certificate for users, %s for
project, user, timestamp
"""),
cfg.StrOpt("project_cert_subject",
default="/C=US/ST=California/O=OpenStack/"
"OU=NovaDev/CN=project-ca-%.16s-%s",
deprecated_group="DEFAULT",
help="""
Subject for certificate for projects, %s for
project, timestamp
"""),
]
def register_opts(conf):
conf.register_group(crypto_opts_group)
conf.register_opts(crypto_opts, crypto_opts_group)
def list_opts():
return {crypto_opts_group: crypto_opts}

View File

@ -0,0 +1,16 @@
---
upgrade:
- |
The following options, previously found in the ``[crypto]`` group, have
been removed:
- ``ca_file``
- ``key_file``
- ``crl_file``
- ``keys_path``
- ``ca_path``
- ``use_project_ca``
- ``user_cert_subject``
- ``project_cert_subject``
These have not been used in recent releases.