From 042d8ef500e8df29f617340fe342afdb512c3af9 Mon Sep 17 00:00:00 2001 From: Carlos Camacho Date: Tue, 6 Apr 2021 01:08:34 +0200 Subject: [PATCH] [stable-2.9] Fix: nmcli bridge-slave fails with error (#74125) This commit fixes the error for adding bridge slaves: nmcli bridge-slave returns "Error: invalid or not allowed setting 'bridge-port' This fix is related to #42460, #54617, and #68065 * changelog --- .../74125-backport_nmcli_module-slave_bridge_error.yml | 2 ++ lib/ansible/modules/net_tools/nmcli.py | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 changelogs/fragments/74125-backport_nmcli_module-slave_bridge_error.yml diff --git a/changelogs/fragments/74125-backport_nmcli_module-slave_bridge_error.yml b/changelogs/fragments/74125-backport_nmcli_module-slave_bridge_error.yml new file mode 100644 index 00000000000..2b6f21e1d57 --- /dev/null +++ b/changelogs/fragments/74125-backport_nmcli_module-slave_bridge_error.yml @@ -0,0 +1,2 @@ +minor_changes: +- nmcli - fix the slaving of bridge interfaces (https://github.com/ansible/ansible/pull/74125). diff --git a/lib/ansible/modules/net_tools/nmcli.py b/lib/ansible/modules/net_tools/nmcli.py index f4e0f5f1990..d99ee5b3c46 100644 --- a/lib/ansible/modules/net_tools/nmcli.py +++ b/lib/ansible/modules/net_tools/nmcli.py @@ -1103,8 +1103,9 @@ class Nmcli(object): 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, @@ -1119,8 +1120,9 @@ class Nmcli(object): 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,