Revert "Register heat tempest plugin"

This reverts commit 00a1814d5e.

Change-Id: If0def06223164609adc3f8ce69c672cfcb93de3f
This commit is contained in:
ricolin 2017-12-17 00:59:18 +08:00
parent 5eb4f8225d
commit 64c37f3ea1
3 changed files with 0 additions and 53 deletions

View File

@ -14,15 +14,6 @@ from oslo_config import cfg
CONF = None
service_available_group = cfg.OptGroup(name="service_available",
title="Available OpenStack Services")
ServiceAvailableGroup = [
cfg.BoolOpt("heat_plugin",
default=True,
help="Whether or not heat is expected to be available"),
]
heat_group = cfg.OptGroup(name="heat_plugin",
title="Heat Service Options")
@ -169,4 +160,3 @@ HeatGroup = [
def list_opts():
yield heat_group.name, HeatGroup
yield service_available_group.name, ServiceAvailableGroup

View File

@ -1,40 +0,0 @@
#
# 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 tempest import config
from tempest.test_discover import plugins
from heat_integrationtests.common import config as heat_config
class HeatTempestPlugin(plugins.TempestPlugin):
def load_tests(self):
base_path = os.path.split(os.path.dirname(
os.path.abspath(__file__)))[0]
test_dir = "heat_integrationtests"
full_test_dir = os.path.join(base_path, test_dir)
return full_test_dir, base_path
def register_opts(self, conf):
config.register_opt_group(conf, heat_config.service_available_group,
heat_config.ServiceAvailableGroup)
config.register_opt_group(conf, heat_config.heat_group,
heat_config.HeatGroup)
heat_config.CONF = config.CONF
def get_opt_lists(self):
return [(heat_config.heat_group.name,
heat_config.HeatGroup)]

View File

@ -184,9 +184,6 @@ heat.templates =
heat_template_version.2018-03-02 = heat.engine.hot.template:HOTemplate20180302
heat_template_version.queens = heat.engine.hot.template:HOTemplate20180302
tempest.test_plugins =
heat_tests = heat_integrationtests.plugin:HeatTempestPlugin
[global]
setup-hooks =
pbr.hooks.setup_hook