Access Tempest config.CONF directly

This ensures that all Tempest plugin configs are loaded. Accessing it
via heat_tempest_plugin.config.CONF assumed that something else was
loading the plugin configs before we tried to access it. This is
probably only the case when running Tempest itself, but we want to be
able to discover and run tests from the heat_integrationtests without
going through Tempest.

Change-Id: I5e9325766ce166e62c731330c462c030cb1e11fc

heat_tempest_plugin/common/test.py

@@ -29,8 +29,8 @@ import testtools
 
 from heat_tempest_plugin.common import exceptions
 from heat_tempest_plugin.common import remote_client
-from heat_tempest_plugin import config
 from heat_tempest_plugin.services import clients
+from tempest import config
 
 LOG = logging.getLogger(__name__)
 _LOG_FORMAT = "%(levelname)8s [%(name)s] %(message)s"

heat_tempest_plugin/config.py

@@ -12,8 +12,6 @@
 
 from oslo_config import cfg
 
-CONF = None
-
 service_available_group = cfg.OptGroup(name="service_available",
                                        title="Available OpenStack Services")
 

heat_tempest_plugin/plugin.py

@@ -34,7 +34,6 @@ class HeatTempestPlugin(plugins.TempestPlugin):
                                   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_tempest_plugin/tests/api/test_heat_api.py

@@ -19,8 +19,8 @@ from gabbi import driver
 from six.moves.urllib import parse as urlparse
 
 from heat_tempest_plugin.common import test
-from heat_tempest_plugin import config
 from heat_tempest_plugin.services import clients
+from tempest import config
 
 TESTS_DIR = 'gabbits'