Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
K
Kolla Ansible
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Very Demiurge Very Mindful
Kolla Ansible
Commits
7cfeffaa
Commit
7cfeffaa
authored
6 years ago
by
Zuul
Committed by
Gerrit Code Review
6 years ago
Browse files
Options
Downloads
Plain Diff
Merge "ovs-dpdkctl.sh syntax error"
parents
7e63c3fc
6f398cef
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
tools/ovs-dpdkctl.sh
+5
-5
5 additions, 5 deletions
tools/ovs-dpdkctl.sh
with
5 additions
and
5 deletions
tools/ovs-dpdkctl.sh
+
5
−
5
View file @
7cfeffaa
...
@@ -238,7 +238,7 @@ function install_network_manager_conf {
...
@@ -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
...
@@ -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 {
...
@@ -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 {
...
@@ -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 {
...
@@ -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
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment