diff options
| author | Mehdi Abaakouk <sileht@redhat.com> | 2016-10-12 11:58:17 +0200 |
|---|---|---|
| committer | Mehdi Abaakouk <sileht@redhat.com> | 2016-11-04 09:25:30 +0100 |
| commit | 79bd7e71732d6f74e1ae9c84678b04b1d97cda5d (patch) | |
| tree | 42d24a46c81645d3e6ca87f84ee77590300ed533 /ceilometer/network | |
| parent | fb7f4b1fcc7b7332f94b2bbc0cdf7f35f66f002e (diff) | |
| download | ceilometer-79bd7e71732d6f74e1ae9c84678b04b1d97cda5d.tar.gz | |
discovery: stop using global conf
Change-Id: I4495674a26ed77b1429d3284680f55175be29a1e
Diffstat (limited to 'ceilometer/network')
| -rw-r--r-- | ceilometer/network/services/discovery.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/ceilometer/network/services/discovery.py b/ceilometer/network/services/discovery.py index 0e5cebb3..5f59c687 100644 --- a/ceilometer/network/services/discovery.py +++ b/ceilometer/network/services/discovery.py @@ -13,8 +13,6 @@ # 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,9 +20,9 @@ from ceilometer import neutron_client class _BaseServicesDiscovery(plugin_base.DiscoveryBase): KEYSTONE_REQUIRED_FOR_SERVICE = 'neutron' - def __init__(self): - super(_BaseServicesDiscovery, self).__init__() - self.neutron_cli = neutron_client.Client(cfg.CONF) + def __init__(self, conf): + super(_BaseServicesDiscovery, self).__init__(conf) + self.neutron_cli = neutron_client.Client(conf) class LBPoolsDiscovery(_BaseServicesDiscovery): |