Merge "Remove nova_cert option"
diff --git a/releasenotes/notes/remove-nova_cert-e2ee70a40e117e8a.yaml b/releasenotes/notes/remove-nova_cert-e2ee70a40e117e8a.yaml
new file mode 100644
index 0000000..1a292f0
--- /dev/null
+++ b/releasenotes/notes/remove-nova_cert-e2ee70a40e117e8a.yaml
@@ -0,0 +1,6 @@
+---
+upgrade:
+ - |
+ The deprecated ``[compute-feature-enabled] nova_cert`` option has been
+ removed. The nova-cert service was removed from nova in 16.0.0 release.
+ Tests of compute root certificates API have also been removed.
diff --git a/tempest/api/compute/certificates/test_certificates.py b/tempest/api/compute/certificates/test_certificates.py
deleted file mode 100644
index 5917931..0000000
--- a/tempest/api/compute/certificates/test_certificates.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 2012 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 tempest.api.compute import base
-from tempest import config
-from tempest.lib import decorators
-
-CONF = config.CONF
-
-
-class CertificatesV2TestJSON(base.BaseV2ComputeTest):
- """Test Certificates API"""
-
- @classmethod
- def skip_checks(cls):
- super(CertificatesV2TestJSON, cls).skip_checks()
- if not CONF.compute_feature_enabled.nova_cert:
- raise cls.skipException("Nova cert is not available")
-
- @decorators.idempotent_id('c070a441-b08e-447e-a733-905909535b1b')
- def test_create_root_certificate(self):
- """Test creating root certificate"""
- self.certificates_client.create_certificate()
-
- @decorators.idempotent_id('3ac273d0-92d2-4632-bdfc-afbc21d4606c')
- def test_get_root_certificate(self):
- """Test getting root certificate details"""
- self.certificates_client.show_certificate('root')
diff --git a/tempest/config.py b/tempest/config.py
index 318ba78..1a08d6b 100644
--- a/tempest/config.py
+++ b/tempest/config.py
@@ -546,13 +546,6 @@
default=True,
help='Does the test environment support creating snapshot '
'images of running instances?'),
- cfg.BoolOpt('nova_cert',
- default=False,
- help='Does the test environment have the nova cert running?',
- deprecated_for_removal=True,
- deprecated_reason="On Nova side, the nova-cert service is "
- "deprecated and the service will be removed "
- "as early as Ocata."),
cfg.BoolOpt('personality',
default=False,
help='Does the test environment support server personality'),