src: drop most slave references from the code
While we cannot remove all the references to "slave" we can remove most of them.
This commit is contained in:
@@ -1124,7 +1124,7 @@ ipv6.ip6-privacy=0
|
||||
<programlisting>
|
||||
[connection]
|
||||
ipv6.ip6-privacy=0
|
||||
connection.autoconnect-slaves=1
|
||||
connection.autoconnect-ports=1
|
||||
vpn.timeout=120
|
||||
|
||||
[connection-wifi-wlan0]
|
||||
|
@@ -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>
|
||||
|
||||
@@ -125,7 +125,7 @@
|
||||
Connection 'ovs-bridge-bridge0' (d10fc64d-1d48-4394-a1b8-e1aea72f27d5) successfully added.
|
||||
<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 \
|
||||
<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>
|
||||
|
@@ -153,8 +153,8 @@ BOOTPROTO=dhcp
|
||||
<para>
|
||||
<programlisting>
|
||||
<emphasis role="bold">Bonding configuration:</emphasis>
|
||||
ifcfg-BOND: ifcfg-BOND-slave:
|
||||
NAME=BOND NAME=BOND-slave
|
||||
ifcfg-BOND: ifcfg-BOND-port:
|
||||
NAME=BOND NAME=BOND-port
|
||||
UUID=b41888aa-924c-450c-b0f8-85a4f0a51b4a UUID=9bb048e4-286a-4cc3-b104-007dbd20decb
|
||||
DEVICE=bond100 DEVICE=eth0
|
||||
BONDING_OPTS="mode=balance-rr miimon=100" ONBOOT=yes
|
||||
@@ -177,16 +177,16 @@ NAME=team0-profile
|
||||
UUID=1d3460a0-7b37-457f-a300-fe8d92da4807
|
||||
ONBOOT=yes
|
||||
|
||||
ifcfg-my_team0_slave1:
|
||||
NAME=team0-slave1
|
||||
ifcfg-my_team0_port1:
|
||||
NAME=team0-port1
|
||||
UUID=d5aed298-c567-4cc1-b808-6d38ecef9e64
|
||||
DEVICE=eth1
|
||||
ONBOOT=yes
|
||||
TEAM_MASTER=team0
|
||||
DEVICETYPE=TeamPort
|
||||
|
||||
ifcfg-my_team0_slave2:
|
||||
NAME=team0-slave2
|
||||
ifcfg-my_team0_port2:
|
||||
NAME=team0-port2
|
||||
UUID=94e75f4e-e5ad-401c-8962-31e0ae5d2215
|
||||
DEVICE=eth2
|
||||
ONBOOT=yes
|
||||
|
@@ -174,7 +174,7 @@ uuid=171ae855-a0ab-42b6-bd0c-60f5812eea9d uuid=d6e8ae98-71f8-4b3d-9d2d-2e2604
|
||||
interface-name=MainBridge interface-name=em1
|
||||
type=bridge type=ethernet
|
||||
controller=MainBridge
|
||||
[bridge] slave-type=bridge
|
||||
[bridge] port-type=bridge
|
||||
interface-name=MainBridge
|
||||
</programlisting>
|
||||
</para>
|
||||
|
@@ -187,56 +187,56 @@ B,DISPATCH</screen>
|
||||
</para>
|
||||
</example>
|
||||
|
||||
<example><title>Adding a bonding controller and two slave connection profiles</title>
|
||||
<example><title>Adding a bonding controller and two port connection profiles</title>
|
||||
<screen><prompt>$ </prompt><userinput>nmcli con add type bond ifname mybond0 mode active-backup</userinput>
|
||||
<prompt>$ </prompt><userinput>nmcli con add type ethernet ifname eth1 controller mybond0</userinput>
|
||||
<prompt>$ </prompt><userinput>nmcli con add type ethernet ifname eth2 controller mybond0</userinput></screen>
|
||||
<para>
|
||||
This example demonstrates adding a bond controller connection and two slaves. The
|
||||
This example demonstrates adding a bond controller connection and two ports. The
|
||||
first command adds a controller bond connection, naming the bonding interface
|
||||
<emphasis>mybond0</emphasis> and using <emphasis>active-backup</emphasis> mode.
|
||||
The next two commands add slaves connections, both enslaved to <emphasis>mybond0</emphasis>.
|
||||
The first slave will be bound to <emphasis>eth1</emphasis> interface, the second to
|
||||
The next two commands add port connections, both attached as port to <emphasis>mybond0</emphasis>.
|
||||
The first port will be bound to <emphasis>eth1</emphasis> interface, the second to
|
||||
<emphasis>eth2</emphasis>.
|
||||
</para>
|
||||
</example>
|
||||
|
||||
<example><title>Adding a team controller and two slave connection profiles</title>
|
||||
<example><title>Adding a team controller and two port connection profiles</title>
|
||||
<screen><prompt>$ </prompt><userinput>nmcli con add type team con-name Team1 ifname Team1 config team1-controller-json.conf</userinput>
|
||||
<prompt>$ </prompt><userinput>nmcli con add type ethernet con-name Team1-slave1 ifname em1 controller Team1</userinput>
|
||||
<prompt>$ </prompt><userinput>nmcli con add type ethernet con-name Team1-slave2 ifname em2 controller Team1</userinput></screen>
|
||||
<prompt>$ </prompt><userinput>nmcli con add type ethernet con-name Team1-port1 ifname em1 controller Team1</userinput>
|
||||
<prompt>$ </prompt><userinput>nmcli con add type ethernet con-name Team1-port2 ifname em2 controller Team1</userinput></screen>
|
||||
<para>
|
||||
This example demonstrates adding a team controller connection profile and two slaves. It is
|
||||
This example demonstrates adding a team controller connection profile and two ports. It is
|
||||
very similar to the bonding example. The first command adds a controller team profile, naming
|
||||
the team interface and the profile <emphasis>Team1</emphasis>. The team configuration
|
||||
for the controller is read from <emphasis>team1-controller-json.conf</emphasis> file. Later, you can
|
||||
change the configuration with <emphasis>modify</emphasis> command
|
||||
(<emphasis role="bold">nmcli con modify Team1 team.config team1-controller-another-json.conf</emphasis>).
|
||||
The last two commands add slaves profiles, both enslaved to <emphasis>Team1</emphasis>.
|
||||
The first slave will be bound to the <emphasis>em1</emphasis> interface, the second to
|
||||
<emphasis>em2</emphasis>. The slaves don't specify <emphasis>config</emphasis> and thus
|
||||
The last two commands add port profiles, both attached as port to <emphasis>Team1</emphasis>.
|
||||
The first port will be bound to the <emphasis>em1</emphasis> interface, the second to
|
||||
<emphasis>em2</emphasis>. The ports don't specify <emphasis>config</emphasis> and thus
|
||||
<emphasis>teamd</emphasis> will use its default configuration. You will activate the whole setup
|
||||
by activating both slaves:
|
||||
<screen> <prompt>$ </prompt><userinput>nmcli con up Team1-slave1</userinput>
|
||||
<prompt>$ </prompt><userinput>nmcli con up Team1-slave2</userinput></screen>
|
||||
by activating both ports:
|
||||
<screen> <prompt>$ </prompt><userinput>nmcli con up Team1-port1</userinput>
|
||||
<prompt>$ </prompt><userinput>nmcli con up Team1-port2</userinput></screen>
|
||||
By default, the created profiles are marked for auto-activation. But if another
|
||||
connection has been activated on the device, the new profile won't activate
|
||||
automatically and you need to activate it manually.
|
||||
</para>
|
||||
</example>
|
||||
|
||||
<example><title>Adding a bridge and two slave profiles</title>
|
||||
<example><title>Adding a bridge and two port profiles</title>
|
||||
<screen><prompt>$ </prompt><userinput>nmcli con add type bridge con-name TowerBridge ifname TowerBridge</userinput>
|
||||
<prompt>$ </prompt><userinput>nmcli con add type ethernet con-name br-slave-1 ifname ens3 controller TowerBridge</userinput>
|
||||
<prompt>$ </prompt><userinput>nmcli con add type ethernet con-name br-slave-2 ifname ens4 controller TowerBridge</userinput>
|
||||
<prompt>$ </prompt><userinput>nmcli con add type ethernet con-name br-port-1 ifname ens3 controller TowerBridge</userinput>
|
||||
<prompt>$ </prompt><userinput>nmcli con add type ethernet con-name br-port-2 ifname ens4 controller TowerBridge</userinput>
|
||||
<prompt>$ </prompt><userinput>nmcli con modify TowerBridge bridge.stp no</userinput></screen>
|
||||
<para>
|
||||
This example demonstrates adding a bridge controller connection and two slaves. The
|
||||
This example demonstrates adding a bridge controller connection and two ports. The
|
||||
first command adds a controller bridge connection, naming the bridge interface and
|
||||
the profile as <emphasis>TowerBridge</emphasis>.
|
||||
The next two commands add slaves profiles, both will be enslaved to
|
||||
The next two commands add ports profiles, both will be attached as port to
|
||||
<emphasis>TowerBridge</emphasis>.
|
||||
The first slave will be tied to <emphasis>ens3</emphasis> interface, the second to
|
||||
The first port will be tied to <emphasis>ens3</emphasis> interface, the second to
|
||||
<emphasis>ens4</emphasis>.
|
||||
The last command will disable 802.1D STP for the TowerBridge profile.
|
||||
</para>
|
||||
@@ -376,7 +376,7 @@ connection.read-only: no
|
||||
connection.permissions:
|
||||
connection.zone: --
|
||||
connection.controller: --
|
||||
connection.slave-type: --
|
||||
connection.port-type: --
|
||||
connection.secondaries:
|
||||
connection.gateway-ping-timeout: 0
|
||||
---------------------------------------------------------------------------
|
||||
@@ -466,7 +466,7 @@ connection.read-only: no
|
||||
connection.permissions:
|
||||
connection.zone: --
|
||||
connection.controller: --
|
||||
connection.slave-type: --
|
||||
connection.port-type: --
|
||||
connection.secondaries:
|
||||
connection.gateway-ping-timeout: 0
|
||||
---------------------------------------------------------------------------
|
||||
@@ -526,7 +526,7 @@ connection.read-only: no
|
||||
connection.permissions:
|
||||
connection.zone: --
|
||||
connection.controller: --
|
||||
connection.slave-type: --
|
||||
connection.port-type: --
|
||||
connection.secondaries:
|
||||
connection.gateway-ping-timeout: 0
|
||||
---------------------------------------------------------------------------
|
||||
|
Reference in New Issue
Block a user