diff --git a/watcher/common/paths.py b/watcher/common/paths.py index 903a651e9..b36187bd8 100644 --- a/watcher/common/paths.py +++ b/watcher/common/paths.py @@ -17,23 +17,9 @@ import os -from oslo_config import cfg +from watcher import conf -PATH_OPTS = [ - cfg.StrOpt('pybasedir', - default=os.path.abspath(os.path.join(os.path.dirname(__file__), - '../')), - help='Directory where the watcher python module is installed.'), - cfg.StrOpt('bindir', - default='$pybasedir/bin', - help='Directory where watcher binaries are installed.'), - cfg.StrOpt('state_path', - default='$pybasedir', - help="Top-level directory for maintaining watcher's state."), -] - -CONF = cfg.CONF -CONF.register_opts(PATH_OPTS) +CONF = conf.CONF def basedir_def(*args): diff --git a/watcher/conf/__init__.py b/watcher/conf/__init__.py index 35583bf1c..551c8ec65 100644 --- a/watcher/conf/__init__.py +++ b/watcher/conf/__init__.py @@ -20,6 +20,7 @@ from oslo_config import cfg from watcher.conf import api +from watcher.conf import paths from watcher.conf import service from watcher.conf import utils @@ -28,3 +29,4 @@ CONF = cfg.CONF service.register_opts(CONF) api.register_opts(CONF) utils.register_opts(CONF) +paths.register_opts(CONF) diff --git a/watcher/conf/_opts.py b/watcher/conf/_opts.py index 0e58ce2ba..688aca35b 100644 --- a/watcher/conf/_opts.py +++ b/watcher/conf/_opts.py @@ -21,8 +21,8 @@ from keystoneauth1 import loading as ka_loading from watcher.applier import manager as applier_manager from watcher.common import clients from watcher.common import exception -from watcher.common import paths from watcher.conf import api as conf_api +from watcher.conf import paths from watcher.conf import utils from watcher.db.sqlalchemy import models from watcher.decision_engine.audit import continuous diff --git a/watcher/conf/paths.py b/watcher/conf/paths.py new file mode 100644 index 000000000..14a0fa1ba --- /dev/null +++ b/watcher/conf/paths.py @@ -0,0 +1,42 @@ +# -*- encoding: utf-8 -*- +# Copyright (c) 2016 Intel Corp +# +# Authors: Prudhvi Rao Shedimbi +# +# 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. + +from oslo_config import cfg + +import os + +PATH_OPTS = [ + cfg.StrOpt('pybasedir', + default=os.path.abspath(os.path.join(os.path.dirname(__file__), + '../')), + help='Directory where the watcher python module is installed.'), + cfg.StrOpt('bindir', + default='$pybasedir/bin', + help='Directory where watcher binaries are installed.'), + cfg.StrOpt('state_path', + default='$pybasedir', + help="Top-level directory for maintaining watcher's state."), +] + + +def register_opts(conf): + conf.register_opts(PATH_OPTS) + + +def list_opts(): + return [('DEFAULT', PATH_OPTS)]