diff options
| author | Hisashi Osanai <osanai.hisashi@jp.fujitsu.com> | 2014-08-08 14:30:43 +0900 |
|---|---|---|
| committer | Hisashi Osanai <osanai.hisashi@jp.fujitsu.com> | 2014-09-19 17:23:52 +0900 |
| commit | 72d65777962a2b93e80f7e17ce6602caa6a79bed (patch) | |
| tree | 83e4e2f01628078b0d6724cec9a73adf3fc61241 /ceilometer/neutron_client.py | |
| parent | 7b89798be3b81259a0440dec928cb11cccb7158d (diff) | |
| download | ceilometer-72d65777962a2b93e80f7e17ce6602caa6a79bed.tar.gz | |
Enable to get service types from configuration file
When services are registered to keystone without using default
service types, pollsters for the services don't work. This fix
enables the pollsters to get service types from ceilometer.conf.
If there is no entry in the file, the default service types
will be used.
Change-Id: Iab30b6e749f5d2af4ecb0bbf6fe1a137793f4c2c
Closes-Bug: 1353356
DocImpact: Add new parameters in ceilometer.conf
Diffstat (limited to 'ceilometer/neutron_client.py')
| -rw-r--r-- | ceilometer/neutron_client.py | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/ceilometer/neutron_client.py b/ceilometer/neutron_client.py index 4c73b0e4..930d7eab 100644 --- a/ceilometer/neutron_client.py +++ b/ceilometer/neutron_client.py @@ -21,6 +21,14 @@ from oslo.config import cfg from ceilometer.openstack.common import log + +service_types_opts = [ + cfg.StrOpt('neutron', + default='network', + help='Neutron service type.'), +] + +cfg.CONF.register_opts(service_types_opts, group='service_types') cfg.CONF.import_group('service_credentials', 'ceilometer.service') LOG = log.getLogger(__name__) @@ -51,7 +59,8 @@ class Client(object): 'password': conf.os_password, 'auth_url': conf.os_auth_url, 'region_name': conf.os_region_name, - 'endpoint_type': conf.os_endpoint_type + 'endpoint_type': conf.os_endpoint_type, + 'service_type': cfg.CONF.service_types.neutron } if conf.os_tenant_id: |