diff options
| author | Carlos Camacho <carloscamachoucv@gmail.com> | 2021-04-06 01:08:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-05 18:08:34 -0500 |
| commit | 042d8ef500e8df29f617340fe342afdb512c3af9 (patch) | |
| tree | 2e842e944a6f6dd8235197fffea8f22f1b600f36 /lib | |
| parent | 7b048c49a846289fe477406d7aee535411ee8fb7 (diff) | |
| download | ansible-042d8ef500e8df29f617340fe342afdb512c3af9.tar.gz | |
[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
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ansible/modules/net_tools/nmcli.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/ansible/modules/net_tools/nmcli.py b/lib/ansible/modules/net_tools/nmcli.py index f4e0f5f199..d99ee5b3c4 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, |