summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorLubomir Rintel <lkundrak@v3.sk>2018-08-06 14:16:55 +0200
committerLubomir Rintel <lkundrak@v3.sk>2018-08-06 18:59:01 +0200
commit57d4286d54450a3b72cba55554c0850f1bfc8e66 (patch)
tree102d2a5e1eebaae92fa3ed2a6d0fc9cf5be3bfa1 /man
parent3c66495a09b1eb8fa18e75fe339db1c53857c706 (diff)
downloadNetworkManager-57d4286d54450a3b72cba55554c0850f1bfc8e66.tar.gz
man/openvswitch: advise to use "master" instead of "conn.master"
It does some extra magic -- normalizes the value and initializes slave-type. https://bugzilla.redhat.com/show_bug.cgi?id=1519176
Diffstat (limited to 'man')
-rw-r--r--man/nm-openvswitch.xml18
1 files changed, 9 insertions, 9 deletions
diff --git a/man/nm-openvswitch.xml b/man/nm-openvswitch.xml
index dc9272692d..7195adcc7b 100644
--- a/man/nm-openvswitch.xml
+++ b/man/nm-openvswitch.xml
@@ -132,9 +132,9 @@
<example><title>Creating a Bridge with a single internal Interface</title>
<screen><prompt>$ </prompt><userinput>nmcli conn add type ovs-bridge conn.interface bridge0</userinput>
Connection 'ovs-bridge-bridge0' (d10fc64d-1d48-4394-a1b8-e1aea72f27d5) successfully added.
-<prompt>$ </prompt><userinput>nmcli conn add type ovs-port conn.interface port0 conn.master bridge0</userinput>
+<prompt>$ </prompt><userinput>nmcli conn add type ovs-port conn.interface port0 master bridge0</userinput>
Connection 'ovs-port-port0' (5ae22bae-bba4-4815-9ade-7e635633e1f0) successfully added.
-<prompt>$ </prompt><userinput>nmcli conn add type ovs-interface conn.interface iface0 conn.master port0 \
+<prompt>$ </prompt><userinput>nmcli conn add type ovs-interface conn.interface iface0 master port0 \
ipv4.method manual ipv4.address 192.0.2.1/24</userinput>
Connection 'ovs-interface-iface0' (3640d2a1-a2fd-4718-92f1-cffadb5b6cdc) successfully added.
</screen>
@@ -145,29 +145,29 @@ Connection 'ovs-interface-iface0' (3640d2a1-a2fd-4718-92f1-cffadb5b6cdc) success
</example>
<example><title>Adding a Linux interface to a Bridge</title>
-<screen><prompt>$ </prompt><userinput>nmcli conn add type ovs-port conn.interface port1 conn.master bridge0</userinput>
+<screen><prompt>$ </prompt><userinput>nmcli conn add type ovs-port conn.interface port1 master bridge0</userinput>
Connection 'ovs-port-port1' (67d041eb-8e7b-4458-afee-a1d07c9c4552) successfully added.
-<prompt>$ </prompt><userinput>nmcli conn add type ethernet conn.interface eth0 conn.master port1</userinput>
+<prompt>$ </prompt><userinput>nmcli conn add type ethernet conn.interface eth0 master port1</userinput>
Connection 'ovs-slave-eth0' (d459c45c-cf78-4c1c-b4b7-505e71379624) successfully added.
</screen>
<para>Again, you need a port.</para>
</example>
<example><title>Creating a VLAN</title>
-<screen><prompt>$ </prompt><userinput>nmcli conn add type ovs-port conn.interface port2 conn.master bridge0 ovs-port.tag 120</userinput>
+<screen><prompt>$ </prompt><userinput>nmcli conn add type ovs-port conn.interface port2 master bridge0 ovs-port.tag 120</userinput>
Connection 'ovs-port-port2' (3994c093-4ef7-4549-a4fd-627b831c3cb8) successfully added.
-<prompt>$ </prompt><userinput>nmcli conn add type ethernet conn.interface eth1 conn.master port2</userinput>
+<prompt>$ </prompt><userinput>nmcli conn add type ethernet conn.interface eth1 master port2</userinput>
Connection 'ovs-slave-eth1' (099be06e-71ad-484d-8d5a-fcadc5f207f5) successfully added.
</screen>
<para>It's just a port with a tag.</para>
</example>
<example><title>Creating a Bond</title>
-<screen><prompt>$ </prompt><userinput>nmcli conn add type ovs-port conn.interface bond0 conn.master bridge0</userinput>
+<screen><prompt>$ </prompt><userinput>nmcli conn add type ovs-port conn.interface bond0 master bridge0</userinput>
Connection 'ovs-port-bond0' (d154ebf9-e999-4e1b-a084-a3de53d25d8a) successfully added.
-<prompt>$ </prompt><userinput>nmcli conn add type ethernet conn.interface eth2 conn.master bond0</userinput>
+<prompt>$ </prompt><userinput>nmcli conn add type ethernet conn.interface eth2 master bond0</userinput>
Connection 'ovs-slave-eth2' (475ac1bf-30b2-4534-a877-27f33f58b082) successfully added.
-<prompt>$ </prompt><userinput>nmcli conn add type ethernet conn.interface eth3 conn.master bond0</userinput>
+<prompt>$ </prompt><userinput>nmcli conn add type ethernet conn.interface eth3 master bond0</userinput>
Connection 'ovs-slave-eth3' (8dedeecb-ed12-482b-b77a-24a4fb835136) successfully added.
</screen>
<para>It's just a Port with multiple interfaces. See nm-settings manual for