Updated the config sample file generation command

Following the update of the project requirements, we should now
use the oslo.config namespace of oslo.log when generating ou
Watcher config sample file.

Change-Id: I7a1f3d555534b40c041b7f042f19fae231b7e80c
Closes-Bug: #1518297

watcher/common/policy.py

@@ -18,7 +18,7 @@
 from oslo_concurrency import lockutils
 from oslo_config import cfg
 
-from watcher.openstack.common import policy
+from oslo_policy import policy
 
 _ENFORCER = None
 CONF = cfg.CONF

watcher/opts.py

@@ -15,9 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import itertools
-from oslo_log import _options
-
 import watcher.api.app
 from watcher.applier.framework import manager_applier
 import watcher.common.messaging.messaging_core
@@ -29,12 +26,6 @@ from watcher.decision_engine.strategy.selector import default \
 
 def list_opts():
     return [
-        ('DEFAULT', itertools.chain(
-            _options.generic_log_opts,
-            _options.log_opts,
-            _options.common_cli_opts,
-            _options.logging_cli_opts
-        )),
         ('api', watcher.api.app.API_SERVICE_OPTS),
         ('watcher_messaging',
          watcher.common.messaging.messaging_core.WATCHER_MESSAGING_OPTS),

watcher/service.py

@@ -21,14 +21,6 @@ from oslo_log import log
 
 LOG = log.getLogger(__name__)
 
-service_opts = [
-    cfg.StrOpt('dummy',
-               default="dummy string",
-               help='help dummy')
-]
-
-cfg.CONF.register_opts(service_opts)
-
 
 def prepare_service(args=None, conf=cfg.CONF):
     log.register_options(conf)