diff options
| author | Mehdi Abaakouk <sileht@redhat.com> | 2016-10-10 22:06:22 +0200 |
|---|---|---|
| committer | Mehdi Abaakouk <sileht@redhat.com> | 2016-10-11 14:59:52 +0200 |
| commit | f28d1398bf4efe0fcec7444db8d61508b5a3918e (patch) | |
| tree | 5a5277995d467f1984ffb7de82da7c8885287ef6 /ceilometer/network | |
| parent | 692c3e474e66cb82d9038be2cc2e0aa67a72720e (diff) | |
| download | ceilometer-f28d1398bf4efe0fcec7444db8d61508b5a3918e.tar.gz | |
neutron_client: stop using global conf
Change-Id: Idd2814b8d971bea7df1aec0522c333f91f79c8ec
Diffstat (limited to 'ceilometer/network')
| -rw-r--r-- | ceilometer/network/services/discovery.py | 4 | ||||
| -rw-r--r-- | ceilometer/network/services/lbaas.py | 2 | ||||
| -rw-r--r-- | ceilometer/network/statistics/opencontrail/driver.py | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/ceilometer/network/services/discovery.py b/ceilometer/network/services/discovery.py index f20af9d4..0e5cebb3 100644 --- a/ceilometer/network/services/discovery.py +++ b/ceilometer/network/services/discovery.py @@ -13,6 +13,8 @@ # License for the specific language governing permissions and limitations # under the License. +from oslo_config import cfg + from ceilometer.agent import plugin_base from ceilometer import neutron_client @@ -22,7 +24,7 @@ class _BaseServicesDiscovery(plugin_base.DiscoveryBase): def __init__(self): super(_BaseServicesDiscovery, self).__init__() - self.neutron_cli = neutron_client.Client() + self.neutron_cli = neutron_client.Client(cfg.CONF) class LBPoolsDiscovery(_BaseServicesDiscovery): diff --git a/ceilometer/network/services/lbaas.py b/ceilometer/network/services/lbaas.py index 5f33d22c..5def3495 100644 --- a/ceilometer/network/services/lbaas.py +++ b/ceilometer/network/services/lbaas.py @@ -227,7 +227,7 @@ class _LBStatsPollster(base.BaseServicesPollster): def __init__(self): super(_LBStatsPollster, self).__init__() - self.client = neutron_client.Client() + self.client = neutron_client.Client(cfg.CONF) self.lb_version = cfg.CONF.service_types.neutron_lbaas_version @staticmethod diff --git a/ceilometer/network/statistics/opencontrail/driver.py b/ceilometer/network/statistics/opencontrail/driver.py index 5cb32dee..492e70e7 100644 --- a/ceilometer/network/statistics/opencontrail/driver.py +++ b/ceilometer/network/statistics/opencontrail/driver.py @@ -14,6 +14,7 @@ import re +from oslo_config import cfg from six.moves.urllib import parse as urlparse from ceilometer.network.statistics import driver @@ -65,7 +66,7 @@ class OpencontrailDriver(driver.Driver): data = { 'o_client': client.Client(endpoint), - 'n_client': neutron_client.Client() + 'n_client': neutron_client.Client(cfg.CONF) } cache['network.statistics.opencontrail'] = data |