Better clean of br-storage from transformations

Change-Id: Ia508ee7b69ab074ac4b041e4728621466ede4c16

build.sh

@@ -43,7 +43,7 @@ pip freeze | grep -q fuel-plugin-builder &&
 rm -rf *.rpm
 
 # Install prerequisites
-yum install rpm rpm-build dpkg-devel createrepo tar git python-pip -y ||
+yum install rpm rpm-build dpkg-devel dpkg-dev createrepo tar git python-pip -y ||
 fail_on_error "Failed installing some required packages"
 
 # Download Fuel plugin builder

deployment_scripts/mellanox_settings.py

@@ -151,16 +151,9 @@ class MellanoxSettings(object):
             'action': 'add-br',
             'name': 'br-storage'
         })
-        br_prv_br_storage_patch = {
-            'action': 'add-patch',
-            'provider': 'ovs',
-            'bridges': [
-                'br-prv',
-                'br-storage',
-            ],
-        }
-        if br_prv_br_storage_patch in transformations:
-            transformations.remove(br_prv_br_storage_patch)
+        for transforamtion in transformations:
+            if ('bridges' in transforamtion) and ('br-storage' in transforamtion['bridges']):
+                transformations.remove(transforamtion)
 
         # Handle iSER interface with and w/o vlan tagging
         storage_vlan = mlnx.get('storage_vlan')

metadata.yaml

@@ -5,7 +5,7 @@ name: mellanox-plugin
 title: Mellanox Openstack features
 
 # Plugin version
-version: 0.2.12
+version: 0.2.13
 
 # Description
 description: Enable features over Mellanox hardware