diff options
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/conf/scheduler.py | 21 | ||||
| -rw-r--r-- | nova/scheduler/filters/trusted_filter.py | 11 |
2 files changed, 26 insertions, 6 deletions
diff --git a/nova/conf/scheduler.py b/nova/conf/scheduler.py index 42796e9a07..bb09624dee 100644 --- a/nova/conf/scheduler.py +++ b/nova/conf/scheduler.py @@ -590,6 +590,9 @@ Configuration options for enabling Trusted Platform Module. trusted_opts = [ cfg.HostAddressOpt("attestation_server", + deprecated_for_removal=True, + deprecated_reason="Incomplete filter", + deprecated_since="Pike", help=""" The host to use as the attestation server. @@ -618,6 +621,9 @@ Related options: * attestation_insecure_ssl """), cfg.StrOpt("attestation_server_ca_file", + deprecated_for_removal=True, + deprecated_reason="Incomplete filter", + deprecated_since="Pike", help=""" The absolute path to the certificate to use for authentication when connecting to the attestation server. See the `attestation_server` help text for more @@ -643,6 +649,9 @@ Related options: """), cfg.PortOpt("attestation_port", default=8443, + deprecated_for_removal=True, + deprecated_reason="Incomplete filter", + deprecated_since="Pike", help=""" The port to use when connecting to the attestation server. See the `attestation_server` help text for more information about host verification. @@ -662,6 +671,9 @@ Related options: """), cfg.StrOpt("attestation_api_url", default="/OpenAttestationWebServices/V1.0", + deprecated_for_removal=True, + deprecated_reason="Incomplete filter", + deprecated_since="Pike", help=""" The URL on the attestation server to use. See the `attestation_server` help text for more information about host verification. @@ -688,6 +700,9 @@ Related options: """), cfg.StrOpt("attestation_auth_blob", secret=True, + deprecated_for_removal=True, + deprecated_reason="Incomplete filter", + deprecated_since="Pike", help=""" Attestation servers require a specific blob that is used to authenticate. The content and format of the blob are determined by the particular attestation @@ -715,6 +730,9 @@ Related options: """), cfg.IntOpt("attestation_auth_timeout", default=60, + deprecated_for_removal=True, + deprecated_reason="Incomplete filter", + deprecated_since="Pike", min=0, help=""" This value controls how long a successful attestation is cached. Once this @@ -742,6 +760,9 @@ Related options: """), cfg.BoolOpt("attestation_insecure_ssl", default=False, + deprecated_for_removal=True, + deprecated_reason="Incomplete filter", + deprecated_since="Pike", help=""" When set to True, the SSL certificate verification is skipped for the attestation service. See the `attestation_server` help text for more diff --git a/nova/scheduler/filters/trusted_filter.py b/nova/scheduler/filters/trusted_filter.py index c54487ad4e..059b6d8030 100644 --- a/nova/scheduler/filters/trusted_filter.py +++ b/nova/scheduler/filters/trusted_filter.py @@ -44,6 +44,7 @@ the Open Attestation project at: """ from oslo_log import log as logging +from oslo_log import versionutils from oslo_serialization import jsonutils from oslo_utils import timeutils import requests @@ -231,12 +232,10 @@ class TrustedFilter(filters.BaseHostFilter): def __init__(self): self.compute_attestation = ComputeAttestation() - LOG.warning(_LW('The TrustedFilter is considered experimental ' - 'by the OpenStack project because it receives much ' - 'less testing than the rest of Nova. This may change ' - 'in the future, but current deployers should be aware ' - 'that the use of it in production right now may be ' - 'risky.')) + msg = _LW('The TrustedFilter is deprecated as it has been marked ' + 'experimental for some time with no tests. It will be ' + 'removed in the 17.0.0 Queens release.') + versionutils.report_deprecated_feature(LOG, msg) # The hosts the instances are running on doesn't change within a request run_filter_once_per_request = True |