From cbd9a83bc9e8afd53c9dd3c1aa880968963d13cd Mon Sep 17 00:00:00 2001 From: Patrick Hoolboom Date: Wed, 17 Sep 2014 09:46:17 -0700 Subject: [PATCH] Moved sensor system_path under content section of config file --- st2common/st2common/config.py | 4 +++- st2reactor/st2reactor/config.py | 6 ------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/st2common/st2common/config.py b/st2common/st2common/config.py index 2063e83a2d..33f6c8f8df 100644 --- a/st2common/st2common/config.py +++ b/st2common/st2common/config.py @@ -25,7 +25,9 @@ def register_opts(ignore_errors=False): content_opts = [ cfg.StrOpt('content_packs_base_path', default='/opt/stackstorm/', - help='path to load sensor modules from') + help='path to load sensor modules from'), + cfg.StrOpt('system_path', default='st2reactor/st2reactor/contrib/sensors', + help='path to load system sensor modules from') ] _do_register_opts(content_opts, 'content', ignore_errors) diff --git a/st2reactor/st2reactor/config.py b/st2reactor/st2reactor/config.py index 5840a9ddae..cc95eb4d6f 100644 --- a/st2reactor/st2reactor/config.py +++ b/st2reactor/st2reactor/config.py @@ -17,12 +17,6 @@ def _register_reactor_opts(): ] CONF.register_opts(logging_opts, group='reactor') - sensors_opts = [ - cfg.StrOpt('system_path', default='st2reactor/st2reactor/contrib/sensors', - help='path to load system sensor modules from') - ] - CONF.register_opts(sensors_opts, group='sensors') - sensor_test_opt = cfg.StrOpt('sensor-path', help='Path to the sensor to test.') CONF.register_cli_opt(sensor_test_opt)