Merge "TrivialFix: Remove cfg import unused"

watcher/decision_engine/cluster/history/ceilometer.py

@@ -17,14 +17,10 @@
 # limitations under the License.
 #
 
-
-from oslo_config import cfg
 from watcher.common import ceilometer_helper
 
 from watcher.decision_engine.cluster.history import base
 
-CONF = cfg.CONF
-
 
 class CeilometerClusterHistory(base.BaseClusterHistory):
     def __init__(self, osc=None):

watcher/decision_engine/model/collector/manager.py

@@ -17,15 +17,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from oslo_config import cfg
-
 from watcher.common import utils
 from watcher.decision_engine.loading import default
 
 
-CONF = cfg.CONF
-
-
 class CollectorManager(object):
 
     def __init__(self):

watcher/decision_engine/strategy/selection/default.py

@@ -14,7 +14,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from oslo_config import cfg
 from oslo_log import log
 
 from watcher._i18n import _
@@ -23,7 +22,6 @@ from watcher.decision_engine.loading import default
 from watcher.decision_engine.strategy.selection import base
 
 LOG = log.getLogger(__name__)
-CONF = cfg.CONF
 
 
 class DefaultStrategySelector(base.BaseSelector):