summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-08-17 09:46:43 +0000
committerGerrit Code Review <review@openstack.org>2018-08-17 09:46:43 +0000
commitc980848048ab90078c8c4d5e3b051265a1b12ede (patch)
tree91415f241104d93f57958f8f355c66fbcab5fdfc
parent73efac1c673122b2b4e4f058fddfe7be87ae48ad (diff)
parent46cd2800fb2f240c15afc6cbdbe8ec2cec1a3a91 (diff)
Merge "bump ovs and dpdk versions to 2.9 and 17.11"stable/rocky
-rw-r--r--devstack/libs/ovs-dpdk2
-rw-r--r--devstack/settings6
2 files changed, 4 insertions, 4 deletions
diff --git a/devstack/libs/ovs-dpdk b/devstack/libs/ovs-dpdk
index 5d6eebc..41efaa4 100644
--- a/devstack/libs/ovs-dpdk
+++ b/devstack/libs/ovs-dpdk
@@ -268,7 +268,7 @@ function ovs_dpdk_pre_install(){
268 fi 268 fi
269 elif [ "$os_VENDOR" == "CentOS" ]; then 269 elif [ "$os_VENDOR" == "CentOS" ]; then
270 # NOTE: uio_pci_generic is provided in default modules 270 # NOTE: uio_pci_generic is provided in default modules
271 sudo yum install -y kernel-devel-$(uname -r) redhat-lsb-core automake 271 sudo yum install -y kernel-devel-$(uname -r) redhat-lsb-core automake numactl-devel
272 fi 272 fi
273 fi 273 fi
274 # Check minimum Mellanox OFED Versions 274 # Check minimum Mellanox OFED Versions
diff --git a/devstack/settings b/devstack/settings
index d327cb0..7f500d9 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -7,8 +7,8 @@ NETWORKING_OVS_DPDK_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && cd .. && pwd
7 7
8#dpdk settings 8#dpdk settings
9OVS_DPDK_MODE=${OVS_DPDK_MODE:-''} 9OVS_DPDK_MODE=${OVS_DPDK_MODE:-''}
10OVS_DPDK_GIT_REPO=${OVS_DPDK_GIT_REPO:- http://dpdk.org/git/dpdk} 10OVS_DPDK_GIT_REPO=${OVS_DPDK_GIT_REPO:-http://dpdk.org/git/dpdk}
11OVS_DPDK_GIT_TAG=${OVS_DPDK_GIT_TAG:-v17.05} 11OVS_DPDK_GIT_TAG=${OVS_DPDK_GIT_TAG:-v17.11}
12OVS_DPDK_DIR=${OVS_DPDK_DIR:-$DEST/DPDK-$OVS_DPDK_GIT_TAG} 12OVS_DPDK_DIR=${OVS_DPDK_DIR:-$DEST/DPDK-$OVS_DPDK_GIT_TAG}
13RTE_TARGET=${RTE_TARGET:-x86_64-native-linuxapp-gcc} 13RTE_TARGET=${RTE_TARGET:-x86_64-native-linuxapp-gcc}
14OVS_DPDK_MEM_SEGMENTS=${OVS_DPDK_MEM_SEGMENTS:-256} 14OVS_DPDK_MEM_SEGMENTS=${OVS_DPDK_MEM_SEGMENTS:-256}
@@ -27,7 +27,7 @@ OVS_INIT_POLICY=${OVS_INIT_POLICY:-'auto'}
27OVS_VSWITCHD_INIT=${OVS_VSWITCHD_INIT:-'auto'} 27OVS_VSWITCHD_INIT=${OVS_VSWITCHD_INIT:-'auto'}
28OVS_DIR=${OVS_DIR:-$DEST/ovs} 28OVS_DIR=${OVS_DIR:-$DEST/ovs}
29OVS_GIT_REPO=${OVS_GIT_REPO:-https://github.com/openvswitch/ovs.git} 29OVS_GIT_REPO=${OVS_GIT_REPO:-https://github.com/openvswitch/ovs.git}
30OVS_GIT_TAG=${OVS_GIT_TAG:-'branch-2.8'} 30OVS_GIT_TAG=${OVS_GIT_TAG:-'branch-2.9'}
31OVS_HUGEPAGE_MOUNT=${OVS_HUGEPAGE_MOUNT:-/mnt/huge} 31OVS_HUGEPAGE_MOUNT=${OVS_HUGEPAGE_MOUNT:-/mnt/huge}
32OVS_HUGEPAGE_MOUNT_PAGESIZE=${OVS_HUGEPAGE_MOUNT_PAGESIZE:-''} 32OVS_HUGEPAGE_MOUNT_PAGESIZE=${OVS_HUGEPAGE_MOUNT_PAGESIZE:-''}
33OVS_NUM_HUGEPAGES=${OVS_NUM_HUGEPAGES:-2048} 33OVS_NUM_HUGEPAGES=${OVS_NUM_HUGEPAGES:-2048}