From 22a146698ed71333a123b131d15288b5655098e9 Mon Sep 17 00:00:00 2001 From: Brad Morgan Date: Tue, 26 Jan 2016 00:17:10 -0800 Subject: [PATCH] small fixups --- quark/drivers/unmanaged.py | 1 - quark/ipam.py | 2 +- quark/plugin_views.py | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/quark/drivers/unmanaged.py b/quark/drivers/unmanaged.py index bff2e52..b0c92d9 100644 --- a/quark/drivers/unmanaged.py +++ b/quark/drivers/unmanaged.py @@ -17,7 +17,6 @@ from oslo_log import log as logging from quark.drivers import base from quark.drivers import security_groups as sg_driver - from quark import network_strategy diff --git a/quark/ipam.py b/quark/ipam.py index c136c38..2ede92f 100644 --- a/quark/ipam.py +++ b/quark/ipam.py @@ -999,7 +999,7 @@ class IronicIpam(QuarkIpam): """IPAM base class for the Ironic driver. The idea here is that there are many small subnets created for a - particular segment for a provider network. And the Ironic IPAM + particular segment for a provider network. The Ironic IPAM family selects unused ones, and only allows a single allocation per subnet. """ diff --git a/quark/plugin_views.py b/quark/plugin_views.py index 7fdc1a1..5208369 100644 --- a/quark/plugin_views.py +++ b/quark/plugin_views.py @@ -213,7 +213,6 @@ def _make_port_address_dict(ip, port, fields=None): subnet_id = ip.get("subnet_id") net_id = ip.get("network_id") - subnet_id = ip.get("subnet_id") show_provider_subnet_ids = CONF.QUARK.show_provider_subnet_ids if STRATEGY.is_provider_network(net_id) and show_provider_subnet_ids: subnet_id = STRATEGY.get_provider_subnet_id(