Revert back to using [heat_plugin] section in tempest.conf
As we're now installing the plugin and running the tests in a venv at the gate, there is no conflict. Change-Id: I63dccc94d6954872257062b12114fab07a4e0873
This commit is contained in:
parent
322707ca4f
commit
f89752b224
@ -23,6 +23,6 @@ To run the tests against DevStack, do the following:
|
|||||||
|
|
||||||
tempest run --regex heat_tempest_plugin.tests
|
tempest run --regex heat_tempest_plugin.tests
|
||||||
|
|
||||||
If custom configuration is required, edit the [orchestration_plugin] section of
|
If custom configuration is required, edit the [heat_plugin] section of
|
||||||
|
|
||||||
$DEST/tempest/etc/tempest.conf
|
$DEST/tempest/etc/tempest.conf
|
||||||
|
@ -79,7 +79,7 @@ def requires_convergence(test_method):
|
|||||||
|
|
||||||
The decorated test will be skipped when convergence is disabled.
|
The decorated test will be skipped when convergence is disabled.
|
||||||
'''
|
'''
|
||||||
plugin = config.CONF.orchestration_plugin
|
plugin = config.CONF.heat_plugin
|
||||||
convergence_enabled = plugin.convergence_engine_enabled
|
convergence_enabled = plugin.convergence_engine_enabled
|
||||||
skipper = testtools.skipUnless(convergence_enabled,
|
skipper = testtools.skipUnless(convergence_enabled,
|
||||||
"Convergence-only tests are disabled")
|
"Convergence-only tests are disabled")
|
||||||
@ -92,7 +92,7 @@ class HeatIntegrationTest(testscenarios.WithScenarios,
|
|||||||
def setUp(self):
|
def setUp(self):
|
||||||
super(HeatIntegrationTest, self).setUp()
|
super(HeatIntegrationTest, self).setUp()
|
||||||
|
|
||||||
self.conf = config.CONF.orchestration_plugin
|
self.conf = config.CONF.heat_plugin
|
||||||
|
|
||||||
self.assertIsNotNone(self.conf.auth_url,
|
self.assertIsNotNone(self.conf.auth_url,
|
||||||
'No auth_url configured')
|
'No auth_url configured')
|
||||||
|
@ -18,12 +18,12 @@ service_available_group = cfg.OptGroup(name="service_available",
|
|||||||
title="Available OpenStack Services")
|
title="Available OpenStack Services")
|
||||||
|
|
||||||
ServiceAvailableGroup = [
|
ServiceAvailableGroup = [
|
||||||
cfg.BoolOpt("orchestration_plugin",
|
cfg.BoolOpt("heat_plugin",
|
||||||
default=True,
|
default=True,
|
||||||
help="Whether or not heat is expected to be available"),
|
help="Whether or not heat is expected to be available"),
|
||||||
]
|
]
|
||||||
|
|
||||||
heat_group = cfg.OptGroup(name="orchestration_plugin",
|
heat_group = cfg.OptGroup(name="heat_plugin",
|
||||||
title="Heat Service Options")
|
title="Heat Service Options")
|
||||||
|
|
||||||
HeatGroup = [
|
HeatGroup = [
|
||||||
@ -43,12 +43,12 @@ HeatGroup = [
|
|||||||
cfg.StrOpt('project_name',
|
cfg.StrOpt('project_name',
|
||||||
help="Project name to use for API requests.",
|
help="Project name to use for API requests.",
|
||||||
deprecated_opts=[cfg.DeprecatedOpt(
|
deprecated_opts=[cfg.DeprecatedOpt(
|
||||||
'tenant_name', group='orchestration_plugin')]),
|
'tenant_name', group='heat_plugin')]),
|
||||||
cfg.StrOpt('admin_project_name',
|
cfg.StrOpt('admin_project_name',
|
||||||
default='admin',
|
default='admin',
|
||||||
help="Admin project name to use for admin API requests.",
|
help="Admin project name to use for admin API requests.",
|
||||||
deprecated_opts=[cfg.DeprecatedOpt(
|
deprecated_opts=[cfg.DeprecatedOpt(
|
||||||
'admin_tenant_name', group='orchestration_plugin')]),
|
'admin_tenant_name', group='heat_plugin')]),
|
||||||
cfg.StrOpt('auth_url',
|
cfg.StrOpt('auth_url',
|
||||||
help="Full URI of the OpenStack Identity API (Keystone)."),
|
help="Full URI of the OpenStack Identity API (Keystone)."),
|
||||||
cfg.StrOpt('auth_version',
|
cfg.StrOpt('auth_version',
|
||||||
|
@ -29,7 +29,7 @@ def load_tests(loader, tests, pattern):
|
|||||||
"""Provide a TestSuite to the discovery process."""
|
"""Provide a TestSuite to the discovery process."""
|
||||||
test_dir = os.path.join(os.path.dirname(__file__), TESTS_DIR)
|
test_dir = os.path.join(os.path.dirname(__file__), TESTS_DIR)
|
||||||
|
|
||||||
conf = config.CONF.orchestration_plugin
|
conf = config.CONF.heat_plugin
|
||||||
if conf.auth_url is None:
|
if conf.auth_url is None:
|
||||||
# It's not configured, let's not load tests
|
# It's not configured, let's not load tests
|
||||||
return
|
return
|
||||||
|
Loading…
x
Reference in New Issue
Block a user