Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[stable-2.9] Fix: nmcli bridge-slave fails with error #74125

Merged
merged 2 commits into from Apr 5, 2021
Merged

[stable-2.9] Fix: nmcli bridge-slave fails with error #74125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6d1685e
[stable-2.9] Fix: nmcli bridge-slave fails with error
ccamacho Apr 5, 2021
4da0606
changelog
ccamacho Apr 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions changelogs/fragments/74125-backport_nmcli_module-slave_bridge_error.yml
View file
Open in desktop
@@ -0,0 +1,2 @@
minor_changes:
- nmcli - fix the slaving of bridge interfaces (https://github.com/ansible/ansible/pull/74125).
6 changes: 4 additions & 2 deletions lib/ansible/modules/net_tools/nmcli.py
View file
Open in desktop
Expand Up @@ -1103,8 +1103,9 @@ def create_connection_bridge_slave(self):
elif self.conn_name is not None:
cmd.append(self.conn_name)

if self.master is not None:
cmd.extend(['master', self.master])
options = {
'master': self.master,
'bridge-port.path-cost': self.path_cost,
'bridge-port.hairpin': self.bool_to_string(self.hairpin),
'bridge-port.priority': self.slavepriority,
Expand All @@ -1119,8 +1120,9 @@ def create_connection_bridge_slave(self):
def modify_connection_bridge_slave(self):
# format for modifying bond-slave interface
cmd = [self.nmcli_bin, 'con', 'mod', self.conn_name]
if self.master is not None:
cmd.extend(['master', self.master])
options = {
'master': self.master,
'bridge-port.path-cost': self.path_cost,
'bridge-port.hairpin': self.bool_to_string(self.hairpin),
'bridge-port.priority': self.slavepriority,
Expand Down