openstack/kolla-ansible
Code Issues Proposed changes

ovs-dpdkctl.sh syntax error

Browse Source 
ovs-dpdkctl.sh doesn't work properly

Closes-Bug: #1770045
Change-Id: Ia450553296f7613f4883b79e9dd1eb3bc950e9c6
Signed-off-by: johjuhyun <juhyun.joh@samsung.com>
This commit is contained in:
johjuhyun 2018-05-08 11:44:05 +09:00
parent 905de55cda
commit 6f398cefb6
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tools/ovs-dpdkctl.sh
View File

@ -238,7 +238,7 @@ function install_network_manager_conf {
fi fi
[[ "$octet" < 3 ]] && mask+=. [[ "$octet" < 3 ]] && mask+=.
done done
if [[ is_redhat_family == 0 ]]; then if [[ $(is_redhat_family) == 0 ]]; then
cat << EOF | tee "/etc/sysconfig/network-scripts/ifcfg-$bridge" cat << EOF | tee "/etc/sysconfig/network-scripts/ifcfg-$bridge"
DEVICE=$bridge DEVICE=$bridge
BOOTPROTO=static BOOTPROTO=static
@ -262,7 +262,7 @@ EOF
function uninstall_network_manager_conf { function uninstall_network_manager_conf {
pair=$(get_value ovs cidr_mappings) pair=$(get_value ovs cidr_mappings)
bridge=`echo $pair | cut -f 1 -d ":"` bridge=`echo $pair | cut -f 1 -d ":"`
if [[ is_redhat_family == 0 ]]; then if [[ $(is_redhat_family) == 0 ]]; then
rm -f /etc/sysconfig/network-scripts/ifcfg-$bridge rm -f /etc/sysconfig/network-scripts/ifcfg-$bridge
else else
rm -f /etc/network/interfaces.d/$bridge.cfg rm -f /etc/network/interfaces.d/$bridge.cfg
@ -332,7 +332,7 @@ function uninstall_service {
function configure_kernel_modules { function configure_kernel_modules {
driver="$(get_value ovs dpdk_interface_driver)" driver="$(get_value ovs dpdk_interface_driver)"
lsmod | grep -ws $driver > /dev/null || modprobe $driver lsmod | grep -ws $driver > /dev/null || modprobe $driver
if [[ is_redhat_family == 0 ]]; then if [[ $(is_redhat_family) == 0 ]]; then
[[ ! -e /etc/modules-load.d/${driver}.conf ]] && echo $driver | tee /etc/modules-load.d/${driver}.conf [[ ! -e /etc/modules-load.d/${driver}.conf ]] && echo $driver | tee /etc/modules-load.d/${driver}.conf
else else
grep -ws $driver /etc/modules > /dev/null || echo $driver | tee -a /etc/modules grep -ws $driver /etc/modules > /dev/null || echo $driver | tee -a /etc/modules
@ -342,7 +342,7 @@ function configure_kernel_modules {
function unconfigure_kernel_modules { function unconfigure_kernel_modules {
driver="$(get_value ovs dpdk_interface_driver)" driver="$(get_value ovs dpdk_interface_driver)"
lsmod | grep -ws $driver > /dev/null && rmmod $driver lsmod | grep -ws $driver > /dev/null && rmmod $driver
if [[ is_redhat_family == 0 ]] ; then if [[ $(is_redhat_family) == 0 ]] ; then
[[ -e /etc/modules-load.d/${driver}.conf ]] && rm -f /etc/modules-load.d/${driver}.conf [[ -e /etc/modules-load.d/${driver}.conf ]] && rm -f /etc/modules-load.d/${driver}.conf
else else
grep -ws $driver /etc/modules > /dev/null && sed -e "s/$driver//" -i /etc/modules grep -ws $driver /etc/modules > /dev/null && sed -e "s/$driver//" -i /etc/modules
@ -363,7 +363,7 @@ function install {
fi fi
systemctl start ovs-dpdkctl systemctl start ovs-dpdkctl
install_network_manager_conf install_network_manager_conf
if [[ is_redhat_family == 0 ]]; then if [[ $(is_redhat_family) == 0 ]]; then
systemctl start ovs-dpdk-bridge systemctl start ovs-dpdk-bridge
fi fi
} }