summaryrefslogtreecommitdiff
path: root/ironic_python_agent/hardware_managers
diff options
context:
space:
mode:
authorJulia Kreger <juliaashleykreger@gmail.com>2018-05-03 08:04:20 -0700
committerJulia Kreger <juliaashleykreger@gmail.com>2018-05-10 15:50:05 -0700
commit3164053f08c4cd40f9634d7ef9e06e4be9565cc5 (patch)
treeb654a68ea1651250c6de00a42e404716914dd73e /ironic_python_agent/hardware_managers
parent2df41a80e3da889ab726a336ffa8b14800e61cda (diff)
downloadironic-python-agent-3164053f08c4cd40f9634d7ef9e06e4be9565cc5.tar.gz
Fix gate and bump CoreOS version to latest stable.
Increases the amount of ram for CoreOS IPA to 2GB as the base CoreOS image is now 310MB. Bumped CPU count for CoreOS runs to 2 CPUs as the concurrency helps boot times for the CoreOS ramdisk. Adds netbase, udev, and open-iscsi to debian jessie container as they are no longer present in the default container. Explicitly set path variable for execution in the debian container as udevadm is in /sbin, and we may not have /sbin on the path that is passed through to the chroot. Also fixed new pep8 test failures. Story: #1600228 Task: #16287 Change-Id: I488445dfd261b7bca322a0be7b4d8ca6105750a3
Diffstat (limited to 'ironic_python_agent/hardware_managers')
-rw-r--r--ironic_python_agent/hardware_managers/mlnx.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/ironic_python_agent/hardware_managers/mlnx.py b/ironic_python_agent/hardware_managers/mlnx.py
index a2d06140..a8adc18d 100644
--- a/ironic_python_agent/hardware_managers/mlnx.py
+++ b/ironic_python_agent/hardware_managers/mlnx.py
@@ -62,8 +62,8 @@ def _detect_hardware():
"""
iface_names = os.listdir('/sys/class/net')
for ifname in iface_names:
- if (hardware._get_device_info(ifname, 'net', 'vendor') ==
- MLNX_VENDOR_ID):
+ if (hardware._get_device_info(
+ ifname, 'net', 'vendor') == MLNX_VENDOR_ID):
return True
return False
@@ -96,8 +96,8 @@ class MellanoxDeviceHardwareManager(hardware.HardwareManager):
if address is None:
raise errors.IncompatibleHardwareMethodError()
vendor = hardware._get_device_info(interface_name, 'net', 'vendor')
- if (len(address) != netutils.INFINIBAND_ADDR_LEN or
- vendor != MLNX_VENDOR_ID):
+ if (len(address) != netutils.INFINIBAND_ADDR_LEN
+ or vendor != MLNX_VENDOR_ID):
raise errors.IncompatibleHardwareMethodError()
mac_addr = _infiniband_address_to_mac(address)