diff options
Diffstat (limited to 'man/nm-openvswitch.xml')
| -rw-r--r-- | man/nm-openvswitch.xml | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/man/nm-openvswitch.xml b/man/nm-openvswitch.xml index 67b5ea7c..ff852129 100644 --- a/man/nm-openvswitch.xml +++ b/man/nm-openvswitch.xml @@ -57,8 +57,8 @@ </listitem> <listitem> <para>The configuration is made up of Bridges, Ports and - Interfaces. Interfaces are always enslaved to Ports, and Ports are always - enslaved to Bridges.</para> + Interfaces. Interfaces are always attached to Ports, and Ports are always + attached to Bridges.</para> </listitem> <listitem> <para>NetworkManager only creates Bridges, Ports and Interfaces @@ -66,7 +66,7 @@ local interface nor its port automatically.</para> </listitem> <listitem> - <para>You can't enslave Interface directly to a Bridge. You + <para>You can't attach Interface directly to a Bridge. You always need a Port, even if it has just one interface.</para> </listitem> <listitem> @@ -89,7 +89,7 @@ <link linkend="nm-settings.property.connection.type">type</link>. Due to the limitations of OVSDB, "empty" Bridges (with no Ports) can't exist. NetworkManager inserts the records for Bridges into OVSDB when a Port is - enslaved. + attached. </para> </refsect2> @@ -101,18 +101,18 @@ Due to the limitations of OVSDB, "empty" Ports (with no Interfaces) can't exist. Ports can also be configured to do VLAN tagging or Bonding. NetworkManager inserts the records for Ports into OVSDB when an Interface is - enslaved. Ports must be enslaved to a Bridge.</para> + attached. Ports must be attached to a Bridge.</para> </refsect2> <refsect2> <title>Interfaces</title> - <para>Interfaces are represented by a connections enslaved to a Port. The + <para>Interfaces are represented by a connections attached to a Port. The system interfaces (that have a corresponding Linux link) have a respective <link linkend="nm-settings.property.connection.type">connection.type</link> of the link (e.g. "wired", "bond", "dummy", etc.). Other interfaces ("internal" or "patch" interfaces) are of ovs-interface type. The OVSDB entries are - inserted upon enslavement to a Port.</para> + inserted upon attachment to a Port.</para> </refsect2> </refsect1> @@ -123,10 +123,10 @@ <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 master bridge0</userinput> +<prompt>$ </prompt><userinput>nmcli conn add type ovs-port conn.interface port0 controller bridge0</userinput> Connection 'ovs-port-port0' (5ae22bae-bba4-4815-9ade-7e635633e1f0) successfully added. -<prompt>$ </prompt><userinput>nmcli conn add type ovs-interface slave-type ovs-port conn.interface iface0 \ - master port0 ipv4.method manual ipv4.address 192.0.2.1/24</userinput> +<prompt>$ </prompt><userinput>nmcli conn add type ovs-interface port-type ovs-port conn.interface iface0 \ + controller port0 ipv4.method manual ipv4.address 192.0.2.1/24</userinput> Connection 'ovs-interface-iface0' (3640d2a1-a2fd-4718-92f1-cffadb5b6cdc) successfully added. </screen> <para>As said above, you need to create a Port even for a single interface. @@ -136,29 +136,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 master bridge0</userinput> +<screen><prompt>$ </prompt><userinput>nmcli conn add type ovs-port conn.interface port1 controller bridge0</userinput> Connection 'ovs-port-port1' (67d041eb-8e7b-4458-afee-a1d07c9c4552) successfully added. -<prompt>$ </prompt><userinput>nmcli conn add type ethernet conn.interface eth0 master port1</userinput> +<prompt>$ </prompt><userinput>nmcli conn add type ethernet conn.interface eth0 controller 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 master bridge0 ovs-port.tag 120</userinput> +<screen><prompt>$ </prompt><userinput>nmcli conn add type ovs-port conn.interface port2 controller 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 master port2</userinput> +<prompt>$ </prompt><userinput>nmcli conn add type ethernet conn.interface eth1 controller 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 master bridge0</userinput> +<screen><prompt>$ </prompt><userinput>nmcli conn add type ovs-port conn.interface bond0 controller bridge0</userinput> Connection 'ovs-port-bond0' (d154ebf9-e999-4e1b-a084-a3de53d25d8a) successfully added. -<prompt>$ </prompt><userinput>nmcli conn add type ethernet conn.interface eth2 master bond0</userinput> +<prompt>$ </prompt><userinput>nmcli conn add type ethernet conn.interface eth2 controller bond0</userinput> Connection 'ovs-slave-eth2' (475ac1bf-30b2-4534-a877-27f33f58b082) successfully added. -<prompt>$ </prompt><userinput>nmcli conn add type ethernet conn.interface eth3 master bond0</userinput> +<prompt>$ </prompt><userinput>nmcli conn add type ethernet conn.interface eth3 controller 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-nmcli manual for |