summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAviram Bar-Haim <aviramb@mellanox.com>2016-05-23 17:47:26 +0300
committerAviram Bar-Haim <aviramb@mellanox.com>2016-05-23 17:47:26 +0300
commit336e3abb87f44bd4ce31764b60423312383179a6 (patch)
tree6859ef0e970a4c777678cb1d30e7a73be1ef6b21
parent4faa9ef57ef90069d5b7228e9567c2bf84b3c7a6 (diff)
Remove pre OFED serializers and enable IB
Notes
Notes (review): Code-Review+1: Rawan Herzallah <rherzallah@asaltech.com> Code-Review+2: Aviram Bar-Haim <aviramb@mellanox.com> Workflow+1: Aviram Bar-Haim <aviramb@mellanox.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Sun, 29 May 2016 11:42:48 +0000 Reviewed-on: https://review.openstack.org/319976 Project: openstack/fuel-plugin-mellanox Branch: refs/heads/master
-rwxr-xr-xdeployment_scripts/install_ofed.sh30
-rw-r--r--deployment_tasks.yaml10
-rw-r--r--metadata.yaml2
3 files changed, 15 insertions, 27 deletions
diff --git a/deployment_scripts/install_ofed.sh b/deployment_scripts/install_ofed.sh
index df7da01..911fc19 100755
--- a/deployment_scripts/install_ofed.sh
+++ b/deployment_scripts/install_ofed.sh
@@ -99,24 +99,22 @@ function install_ofed_without_fw_update () {
99} 99}
100 100
101function enable_eipoib (){ 101function enable_eipoib (){
102 if [ $NETWORK_TYPE == 'infiniband' ]; then 102 sed -i s/^E_IPOIB_LOAD.*$/E_IPOIB_LOAD=yes/g /etc/infiniband/openib.conf
103 sed -i s/^E_IPOIB_LOAD.*$/E_IPOIB_LOAD=yes/g /etc/infiniband/openib.conf
104 103
105 # Set Buffers size 104 # Set Buffers size
106 if [ -f /etc/modprobe.d/ib_ipoib.conf ];then 105 if [ -f /etc/modprobe.d/ib_ipoib.conf ];then
107 sed -i s/^.*queue_size.*$//g /etc/modprobe.d/ib_ipoib.conf 106 sed -i s/^.*queue_size.*$//g /etc/modprobe.d/ib_ipoib.conf
108 fi
109 if [[ $ROLE == *controller* ]];then
110 buffer_size=32
111 else
112 buffer_size=128
113 fi
114 echo "options ib_ipoib recv_queue_size=$buffer_size send_queue_size=$buffer_size" > /etc/modprobe.d/ipoib.conf
115
116 # Use fixed MLNX_OFED scripts
117 \cp -f ./ipoibd /sbin/ipoibd
118 \cp -f ./openibd /etc/init.d/openibd
119 fi 107 fi
108 if [[ $ROLE == *controller* ]];then
109 buffer_size=32
110 else
111 buffer_size=128
112 fi
113 echo "options ib_ipoib recv_queue_size=$buffer_size send_queue_size=$buffer_size" > /etc/modprobe.d/ipoib.conf
114
115 # Use fixed MLNX_OFED scripts
116 \cp -f ./ipoibd /sbin/ipoibd
117 \cp -f ./openibd /etc/init.d/openibd
120} 118}
121 119
122if ! is_ofed_installed; then 120if ! is_ofed_installed; then
diff --git a/deployment_tasks.yaml b/deployment_tasks.yaml
index dd322c0..86e5fa4 100644
--- a/deployment_tasks.yaml
+++ b/deployment_tasks.yaml
@@ -40,16 +40,6 @@
40 parameters: 40 parameters:
41 cmd: ./link_astute_file.sh 41 cmd: ./link_astute_file.sh
42 timeout: 10 42 timeout: 10
43# Add relevant settings for Mellanox manifests to mellanox plugin section in
44# Hiera, to make the data easily accessible and independent of astute.yaml
45- id: customize_mellanox_hiera
46 role: '*'
47 required_for: [validate_kernel_devel]
48 requires: [link_astute_file]
49 type: shell
50 parameters:
51 cmd: ./mellanox_settings.py
52 timeout: 100
53# Verify kernel-devel packages are installed (if CentOS) 43# Verify kernel-devel packages are installed (if CentOS)
54- id: validate_kernel_devel 44- id: validate_kernel_devel
55 role: '*' 45 role: '*'
diff --git a/metadata.yaml b/metadata.yaml
index 1dd8dae..b8ba0ca 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -5,7 +5,7 @@ name: mellanox-plugin
5title: Mellanox ConnectX-4 Openstack Features 5title: Mellanox ConnectX-4 Openstack Features
6 6
7# Plugin version 7# Plugin version
8version: 3.1.5 8version: 3.1.8
9 9
10# Description 10# Description
11description: Enable features over Mellanox ConnectX-4 Adapters 11description: Enable features over Mellanox ConnectX-4 Adapters