From 9f502535e43f387c7d597f9e3aae86c4bdbdd88f Mon Sep 17 00:00:00 2001
From: Doug Hellmann <doug@doughellmann.com>
Date: Fri, 20 Feb 2015 12:45:17 -0500
Subject: [PATCH] Restore missing module for pre-release test script

Restore a module missing from the pre-release test script so the version
in oslotest is usable.

Change-Id: I300318c9e051204677824d52afaa211a91e97bc0
---
 oslotest/tools/__init__.py       |  0
 oslotest/tools/config.py         | 48 ++++++++++++++++++++++++++++++++
 tools/oslo_run_pre_release_tests |  2 +-
 3 files changed, 49 insertions(+), 1 deletion(-)
 create mode 100644 oslotest/tools/__init__.py
 create mode 100644 oslotest/tools/config.py

diff --git a/oslotest/tools/__init__.py b/oslotest/tools/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/oslotest/tools/config.py b/oslotest/tools/config.py
new file mode 100644
index 0000000..77d6e7e
--- /dev/null
+++ b/oslotest/tools/config.py
@@ -0,0 +1,48 @@
+#
+#    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.
+"""Utilities functions for working with oslo.config from the tool scripts.
+"""
+
+import os
+
+from oslo_config import cfg
+
+DEFAULT_CONFIG_FILES = [
+    './oslo.conf',
+    os.path.expanduser('~/.oslo.conf'),
+]
+
+
+def get_config_parser():
+    conf = cfg.ConfigOpts()
+    conf.register_cli_opt(
+        cfg.StrOpt(
+            'repo_root',
+            default='.',
+            help='directory containing the git repositories',
+        )
+    )
+    return conf
+
+
+def parse_arguments(conf):
+    # Look for a few configuration files, and load the ones we find.
+    default_config_files = [
+        f
+        for f in DEFAULT_CONFIG_FILES
+        if os.path.exists(f)
+    ]
+    return conf(
+        project='oslo',
+        default_config_files=default_config_files,
+    )
diff --git a/tools/oslo_run_pre_release_tests b/tools/oslo_run_pre_release_tests
index 2ff69c6..ecaa55d 100755
--- a/tools/oslo_run_pre_release_tests
+++ b/tools/oslo_run_pre_release_tests
@@ -22,7 +22,7 @@ import subprocess
 import sys
 
 from oslo_config import cfg
-import oslo_tool_config as tconfig
+from oslotest.tools import config as tconfig
 from pbr import packaging
 import pkg_resources