From b6596013d98fc3567cd37575b7a1f37a5f43c955 Mon Sep 17 00:00:00 2001
From: Matthew Treinish <mtreinish@kortar.org>
Date: Thu, 28 Aug 2014 23:00:38 -0400
Subject: [PATCH] Stop using oslo logging

Using oslo logging in the library is causing duplicate option errors
in tempest. Instead this commit switches to the stdlib python logging
module.
---
 openstack-common.conf            | 1 -
 tempest_lib/base.py              | 3 +--
 tempest_lib/cli/base.py          | 2 +-
 tempest_lib/cli/output_parser.py | 2 +-
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/openstack-common.conf b/openstack-common.conf
index 13f6206..94ad436 100644
--- a/openstack-common.conf
+++ b/openstack-common.conf
@@ -1,7 +1,6 @@
 [DEFAULT]
 
 # The list of modules to copy from oslo-incubator.git
-module=log
 module=versionutils
 
 
diff --git a/tempest_lib/base.py b/tempest_lib/base.py
index 53b0abc..c0e4ae9 100644
--- a/tempest_lib/base.py
+++ b/tempest_lib/base.py
@@ -13,6 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+import logging
 import os
 import sys
 
@@ -20,8 +21,6 @@ import fixtures
 import testresources
 import testtools
 
-from tempest_lib.openstack.common import log as logging
-
 LOG = logging.getLogger(__name__)
 
 
diff --git a/tempest_lib/cli/base.py b/tempest_lib/cli/base.py
index 98c368f..ce18734 100644
--- a/tempest_lib/cli/base.py
+++ b/tempest_lib/cli/base.py
@@ -14,6 +14,7 @@
 #    under the License.
 
 import functools
+import logging
 import os
 import shlex
 import subprocess
@@ -23,7 +24,6 @@ import testtools
 from tempest_lib import base
 import tempest_lib.cli.output_parser
 from tempest_lib import exceptions
-from tempest_lib.openstack.common import log as logging
 from tempest_lib.openstack.common import versionutils
 
 
diff --git a/tempest_lib/cli/output_parser.py b/tempest_lib/cli/output_parser.py
index d5e5039..668407a 100644
--- a/tempest_lib/cli/output_parser.py
+++ b/tempest_lib/cli/output_parser.py
@@ -15,10 +15,10 @@
 
 """Collection of utilities for parsing CLI clients output."""
 
+import logging
 import re
 
 from tempest_lib import exceptions
-from tempest_lib.openstack.common import log as logging
 
 
 LOG = logging.getLogger(__name__)