diff options
| author | Mehdi Abaakouk <sileht@redhat.com> | 2016-10-13 14:29:28 +0200 |
|---|---|---|
| committer | Mehdi Abaakouk <sileht@redhat.com> | 2016-11-24 15:29:46 +0100 |
| commit | 1842e19487b4afb92cc5d2e87f5cf4281ed34603 (patch) | |
| tree | f50dd85fc5481d5d512ccf19e7be59d4a80c219b /ceilometer/network | |
| parent | e16e2329e6a32a784e054f02ea37b7c19c35f7ac (diff) | |
| download | ceilometer-1842e19487b4afb92cc5d2e87f5cf4281ed34603.tar.gz | |
register ceilometer options at runtime
This remove pollsters option from configfile sample
due to a duplicate option registration. This will
be fixed later.
The exchange_control group in the config sample doesn't exit
in reality exchange are in DEFAULT group.
This removes usage of cfg.CONF everywhere left.
This adds all missing OPTS in sample file.
Change-Id: I48c11ee7e1aae65847958b98532b3bdb48a3ceb5
Diffstat (limited to 'ceilometer/network')
| -rw-r--r-- | ceilometer/network/floatingip.py | 3 | ||||
| -rw-r--r-- | ceilometer/network/statistics/opencontrail/client.py | 5 | ||||
| -rw-r--r-- | ceilometer/network/statistics/opendaylight/client.py | 5 |
3 files changed, 0 insertions, 13 deletions
diff --git a/ceilometer/network/floatingip.py b/ceilometer/network/floatingip.py index ce178704..b64c6429 100644 --- a/ceilometer/network/floatingip.py +++ b/ceilometer/network/floatingip.py @@ -16,7 +16,6 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo_config import cfg from oslo_log import log from ceilometer.i18n import _LW @@ -25,8 +24,6 @@ from ceilometer import sample LOG = log.getLogger(__name__) -cfg.CONF.import_group('service_types', 'ceilometer.neutron_client') - class FloatingIPPollster(base.BaseServicesPollster): diff --git a/ceilometer/network/statistics/opencontrail/client.py b/ceilometer/network/statistics/opencontrail/client.py index 5a3f623c..f2f79651 100644 --- a/ceilometer/network/statistics/opencontrail/client.py +++ b/ceilometer/network/statistics/opencontrail/client.py @@ -14,7 +14,6 @@ import copy -from oslo_config import cfg from oslo_log import log import requests import six @@ -23,10 +22,6 @@ from six.moves.urllib import parse as urlparse from ceilometer.i18n import _ -CONF = cfg.CONF -CONF.import_opt('http_timeout', 'ceilometer.service') - - LOG = log.getLogger(__name__) diff --git a/ceilometer/network/statistics/opendaylight/client.py b/ceilometer/network/statistics/opendaylight/client.py index 26d9a36b..30379d14 100644 --- a/ceilometer/network/statistics/opendaylight/client.py +++ b/ceilometer/network/statistics/opendaylight/client.py @@ -15,7 +15,6 @@ import abc -from oslo_config import cfg from oslo_log import log import requests from requests import auth @@ -24,10 +23,6 @@ import six from ceilometer.i18n import _ -CONF = cfg.CONF -CONF.import_opt('http_timeout', 'ceilometer.service') - - LOG = log.getLogger(__name__) |