Move heat_available option to service_available
This commit moves the heat_available config option from the
orchestration group to under the service_available group. The option
is also renamed to heat.
Change-Id: I86c93331a53b5a7323afe27839338ffa1428015f
diff --git a/etc/tempest.conf.sample b/etc/tempest.conf.sample
index 3579026..a73e8a0 100644
--- a/etc/tempest.conf.sample
+++ b/etc/tempest.conf.sample
@@ -306,9 +306,6 @@
# tests spawn full VMs, which could be slow if the test is already in a VM.
build_timeout = 300
-# Whether or not Heat is expected to be available
-heat_available = false
-
# Instance type for tests. Needs to be big enough for a
# full OS plus the test workload
instance_type = m1.micro
@@ -358,3 +355,5 @@
swift = True
# Whether or not nova is expected to be available
nova = True
+# Whether or not Heat is expected to be available
+heat = false
diff --git a/tempest/api/orchestration/base.py b/tempest/api/orchestration/base.py
index ffa534a..a0b248c 100644
--- a/tempest/api/orchestration/base.py
+++ b/tempest/api/orchestration/base.py
@@ -31,7 +31,7 @@
os = clients.OrchestrationManager()
cls.orchestration_cfg = os.config.orchestration
- if not cls.orchestration_cfg.heat_available:
+ if not os.config.service_available.heat:
raise cls.skipException("Heat support is required")
cls.build_timeout = cls.orchestration_cfg.build_timeout
cls.build_interval = cls.orchestration_cfg.build_interval
diff --git a/tempest/config.py b/tempest/config.py
index 5eb52dc..d9de205 100644
--- a/tempest/config.py
+++ b/tempest/config.py
@@ -391,9 +391,6 @@
cfg.IntOpt('build_timeout',
default=300,
help="Timeout in seconds to wait for a stack to build."),
- cfg.BoolOpt('heat_available',
- default=False,
- help="Whether or not Heat is expected to be available"),
cfg.StrOpt('instance_type',
default='m1.micro',
help="Instance type for tests. Needs to be big enough for a "
@@ -554,6 +551,9 @@
cfg.BoolOpt('nova',
default=True,
help="Whether or not nova is expected to be available"),
+ cfg.BoolOpt('heat',
+ default=False,
+ help="Whether or not Heat is expected to be available"),
]