Skip to content

Commit

Permalink
Merge pull request #2648 from openshift-cherrypick-robot/cherry-pick-…
Browse files Browse the repository at this point in the history
…2645-to-release-4.8

[release-4.8] Bug 1977426: Fix team config JSON format for nmcli command
  • Loading branch information
openshift-merge-robot committed Jul 1, 2021
2 parents 3f6db24 + a78acea commit 29813c8
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions templates/common/_base/files/configure-ovs-network.yaml
Expand Up @@ -181,10 +181,9 @@ contents:
nmcli device disconnect $iface
# use ${extra_phys_args[@]+"${extra_phys_args[@]}"} instead of ${extra_phys_args[@]} to be compatible with bash 4.2 in RHEL7.9
extra_args=${extra_phys_args[@]+"${extra_phys_args[@]}"}
if ! nmcli connection show ovs-if-phys0 &> /dev/null; then
nmcli c add type ${iface_type} conn.interface ${iface} master ovs-port-phys0 con-name ovs-if-phys0 \
connection.autoconnect-priority 100 802-3-ethernet.mtu ${iface_mtu} ${extra_args}
connection.autoconnect-priority 100 802-3-ethernet.mtu ${iface_mtu} ${extra_phys_args[@]+"${extra_phys_args[@]}"}
fi
# Update connections with master property set to use the new device name
Expand Down

0 comments on commit 29813c8

Please sign in to comment.