From 212b1ce28a4038378a0e74ccdb4bfb78978fa6ec Mon Sep 17 00:00:00 2001 From: Aviram Bar-Haim Date: Tue, 15 Mar 2016 21:20:35 +0200 Subject: [PATCH] Stabilizing iSER interface after reboot By changing the eth prefix to mlnx Change-Id: If49af5c18d8fc240911a6a8be13ce60b43cb46f1 --- deployment_scripts/mellanox_settings.py | 4 ++-- metadata.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/deployment_scripts/mellanox_settings.py b/deployment_scripts/mellanox_settings.py index 7c5d560..a5edd93 100755 --- a/deployment_scripts/mellanox_settings.py +++ b/deployment_scripts/mellanox_settings.py @@ -25,7 +25,7 @@ MLNX_SECTION = 'mellanox-plugin' SETTINGS_FILE = '/etc/astute.yaml' PLUGIN_OVERRIDE_FILE = '/etc/hiera/override/plugins.yaml' MLNX_DRIVERS_LIST = ('mlx4_en', 'eth_ipoib') -ISER_IFC_NAME = 'eth_iser0' +ISER_IFC_NAME = 'mlnx_iser0' LOG_FILE = '/var/log/mellanox-plugin.log' class MellanoxSettingsException(Exception): @@ -152,7 +152,7 @@ class MellanoxSettings(object): storage_vlan = mlnx.get('storage_vlan') storage_parent = cls.get_interface_by_network('storage') if storage_vlan and mlnx['driver'] == 'mlx4_en': # Use VLAN dev - vlan_name = "{0}{1}".format('vlan', storage_vlan) + vlan_name = "{0}.{1}".format(ISER_IFC_NAME, storage_vlan) # Set storage rule to iSER interface vlan interface cls.data['network_scheme']['roles']['storage'] = vlan_name # Set iSER interface vlan interface diff --git a/metadata.yaml b/metadata.yaml index cf2501f..5a43602 100644 --- a/metadata.yaml +++ b/metadata.yaml @@ -5,7 +5,7 @@ name: mellanox-plugin title: Mellanox Openstack features # Plugin version -version: 2.0.34 +version: 2.0.35 # Description description: Enable features over Mellanox hardware