small fixups

This commit is contained in:
Brad Morgan
2016-01-26 00:17:10 -08:00
parent c73011274a
commit 22a146698e
3 changed files with 1 additions and 3 deletions

View File

@@ -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

View File

@@ -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.
"""

View File

@@ -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(