openstack/octavia
Code Issues Proposed changes

Merge "Remove unneeded sudo in lvs-masquerade.sh" into stable/yoga

Browse Source
This commit is contained in:
Zuul 2022-05-07 10:43:49 +00:00 committed by Gerrit Code Review
commit b707808cad
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -33,6 +33,7 @@ tempest.log
*~ *~
.eggs/ .eggs/
.ropeproject/ .ropeproject/
*.qcow2
# Files created by releasenotes build # Files created by releasenotes build
releasenotes/build releasenotes/build

4
elements/amphora-agent/static/usr/local/bin/lvs-masquerade.sh
View File

@ -30,7 +30,7 @@ fi
if [ "$1" == "add" ]; then if [ "$1" == "add" ]; then
if [ -x "$(sudo bash -c 'command -v nft')" ]; then if [ -x "$(command -v nft)" ]; then
# Note: inet for nat requires a 5.2 or newer kernel. # Note: inet for nat requires a 5.2 or newer kernel.
if [ "$2" == "ipv4" ]; then if [ "$2" == "ipv4" ]; then
nft add table ip octavia-ipv4 nft add table ip octavia-ipv4
@ -77,7 +77,7 @@ if [ "$1" == "add" ]; then
elif [ "$1" == "delete" ]; then elif [ "$1" == "delete" ]; then
if [ -x "$(sudo bash -c 'command -v nft')" ]; then if [ -x "$(command -v nft)" ]; then
if [ "$2" == "ipv4" ]; then if [ "$2" == "ipv4" ]; then
nft flush chain ip octavia-ipv4 ip-udp-masq nft flush chain ip octavia-ipv4 ip-udp-masq
nft delete chain ip octavia-ipv4 ip-udp-masq nft delete chain ip octavia-ipv4 ip-udp-masq

6
releasenotes/notes/fix-selinux-issue-with-lvs-masquerade.sh-ebbb89886148c70f.yaml Normal file
View File

@ -0,0 +1,6 @@
---
fixes:
- |
Fixed issue with SELinux and the lvs-masquerade.sh script on the amphora.
The script already runs with root permissions, so the use of sudo inside the
script is unneeded.