x/daisycloud-core
Code Issues Proposed changes

Interface which has dataplane can't be ignore

Browse Source 
dataplane can be assigned to the same interface with other network,
so it can't be ignore and ip should not be clear

Change-Id: I8c725f20de28d3d0d9d062c38cf0ca01b05c9df1
This commit is contained in:
10190291
2017-01-22 11:30:04 +08:00
parent 1a134eee46
commit 5987005da7
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/daisy/daisy/api/backends/common.py
View File

@@ -36,6 +36,7 @@ from daisy.api.backends.osinstall import osdriver
import ConfigParser import ConfigParser
import copy import copy
import fcntl import fcntl
from oslo_utils import importutils
STR_MASK = '*' * 8 STR_MASK = '*' * 8
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)
@@ -1129,7 +1130,7 @@ def if_used_shared_storage(req, cluster_id):
backend_disk = importutils.import_module( backend_disk = importutils.import_module(
'daisy.api.backends.%s.disk_array' % backend) 'daisy.api.backends.%s.disk_array' % backend)
except Exception: except Exception:
return False pass
else: else:
if hasattr(backend_disk, 'get_disk_array_info'): if hasattr(backend_disk, 'get_disk_array_info'):
disks_info = backend_disk.get_disk_array_info(req, cluster_id) disks_info = backend_disk.get_disk_array_info(req, cluster_id)

4
code/daisy/daisy/api/backends/osinstall/pxe/install.py
View File

@@ -468,10 +468,6 @@ def _get_host_interfaces(host_info):
for interface in interfaces: for interface in interfaces:
no_dup_networks = {} no_dup_networks = {}
for assigned_network in interface['assigned_networks']: for assigned_network in interface['assigned_networks']:
if assigned_network['network_type'] == 'DATAPLANE':
assigned_network['ip'] = None
break
# remove duplicates assigned networks # remove duplicates assigned networks
if assigned_network.get('ip') not in no_dup_networks.keys() \ if assigned_network.get('ip') not in no_dup_networks.keys() \
or assigned_network.get('network_type') == 'MANAGEMENT': or assigned_network.get('network_type') == 'MANAGEMENT':