openstack
/
octavia
Code Issues Proposed changes

Merge "Save neutron calls if plugin does not support dns-integration"

This commit is contained in:
Jenkins 2017-01-05 06:42:20 +00:00 committed by Gerrit Code Review
parent 38aca2cfaf 32ada008d4
commit 71f0aea35f
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
octavia/network/drivers/neutron/allowed_address_pairs.py
View File

@ -460,6 +460,10 @@ class AllowedAddressPairsDriver(neutron_base.BaseNeutronDriver):
self._update_security_group_rules(load_balancer, sec_grp.get('id'))
def failover_preparation(self, amphora):
if self.dns_integration_enabled:
self._failover_preparation(amphora)
def _failover_preparation(self, amphora):
interfaces = self.get_plugged_networks(compute_id=amphora.compute_id)
ports = []
@ -475,10 +479,8 @@ class AllowedAddressPairsDriver(neutron_base.BaseNeutronDriver):
for port in ports:
try:
if self.dns_integration_enabled:
self.neutron_client.update_port(port.id,
{'port': {'dns_name': ''}})
self.neutron_client.update_port(port.id,
{'port': {'dns_name': ''}})
except (neutron_client_exceptions.NotFound,
neutron_client_exceptions.PortNotFoundClient):