From 4dd7266601605fef9e0bdb39c7f83ae6d0833c7f Mon Sep 17 00:00:00 2001 From: Aviram Bar-Haim Date: Thu, 14 Jan 2016 14:35:57 +0200 Subject: [PATCH] Fix VLAN param casting to int in mellanox conf Change-Id: Idb3f67e6f12f089f48d2316a1249ee0ee7ff124b --- deployment_scripts/mellanox_settings.py | 2 +- metadata.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/deployment_scripts/mellanox_settings.py b/deployment_scripts/mellanox_settings.py index 62f752b..ff20a46 100755 --- a/deployment_scripts/mellanox_settings.py +++ b/deployment_scripts/mellanox_settings.py @@ -111,7 +111,7 @@ class MellanoxSettings(object): "Failed reading vlan for br-storage" ) if mlnx['driver'] == 'eth_ipoib': - pkey = format((vlan ^ 0x8000),'04x') + pkey = format((int(vlan) ^ 0x8000),'04x') mlnx['storage_pkey'] = pkey @classmethod diff --git a/metadata.yaml b/metadata.yaml index 83f68b5..a976d4c 100644 --- a/metadata.yaml +++ b/metadata.yaml @@ -5,7 +5,7 @@ name: mellanox-plugin title: Mellanox Openstack features # Plugin version -version: 2.0.11 +version: 2.0.12 # Description description: Enable features over Mellanox hardware