Allocate enough memeory for dpdk hugepages
Rely on fuel allocate_hugepages task and use dpdk init script only for mounting hugepages. Change-Id: Id561effae09aca21d82868424f61794e8fb03c32 Signed-off-by: Michal Skalski <mskalski@mirantis.com>
This commit is contained in:
parent
cde514abaa
commit
c1e14c9412
|
@ -10,7 +10,6 @@ nsh=$2
|
|||
dpdk=$3
|
||||
dpdk_socket_mem=${4:-''}
|
||||
|
||||
|
||||
if [ $nsh = 'true' ]
|
||||
then
|
||||
curl http://$host:8080/plugins/fuel-plugin-ovs-0.9/repositories/ubuntu/ovs-nsh-dpdk.tar.gz | tar -xzv
|
||||
|
@ -38,8 +37,8 @@ else
|
|||
dpkg -i dpdk_16.07-1_amd64.deb
|
||||
dpkg -i openvswitch-switch-dpdk_2.5.90-1_amd64.deb
|
||||
|
||||
dpdk_pages=$(($dpdk_socket_mem / 2))
|
||||
sed -i "s/[# ]*\(NR_2M_PAGES=\).*/\1${dpdk_pages}/" /etc/dpdk/dpdk.conf
|
||||
#Set to 0, dpdk init script mount hugepages but don't change current allocation
|
||||
sed -i "s/[# ]*\(NR_2M_PAGES=\).*/\10/" /etc/dpdk/dpdk.conf
|
||||
service dpdk start
|
||||
|
||||
ovs-vsctl --no-wait set Open_vSwitch . other_config:dpdk-init=true
|
||||
|
|
|
@ -11,7 +11,7 @@ $ovs_socket_mem = join(pick($dpdk['ovs_socket_mem'], []), ',')
|
|||
if $operatingsystem == 'Ubuntu' {
|
||||
exec { 'install ovs_nsh_dpdk':
|
||||
command => "curl http://${master_ip}:8080/plugins/fuel-plugin-ovs-0.9/deployment_scripts/install.sh | bash -s ${master_ip} ${install_nsh} ${install_dpdk} ${ovs_socket_mem}",
|
||||
path => "/usr/bin:/usr/sbin:/bin:/sbin";
|
||||
path => "/usr/bin:/usr/sbin:/bin:/sbin",
|
||||
}
|
||||
} elsif $operatingsystem == 'CentOS' {
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue