Skip to content

Commit 77bf697

Browse files
authored
Merge pull request #71820 from sbeskin-redhat/CNV_35121_Add_MetalLB_Operator_to_network_post_install_config
CNV-35121: Add MetalLB Operator to network post-install config
2 parents 88a992f + b391e98 commit 77bf697

File tree

1 file changed

+5
-15
lines changed

1 file changed

+5
-15
lines changed

virt/post_installation_configuration/virt-post-install-network-config.adoc

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,26 +16,17 @@ endif::openshift-rosa,openshift-dedicated[]
1616
== Installing networking Operators
1717

1818
ifndef::openshift-rosa,openshift-dedicated[]
19-
You must install the xref:../../networking/k8s_nmstate/k8s-nmstate-about-the-k8s-nmstate-operator.adoc#k8s-nmstate-about-the-k8s-nmstate-operator[Kubernetes NMState Operator] to configure a Linux bridge network for live migration or external access to virtual machines (VMs).
20-
endif::openshift-rosa,openshift-dedicated[]
21-
ifdef::openshift-rosa,openshift-dedicated[]
22-
// hide link until Networking docs are ported: xref: ../../networking/k8s_nmstate/k8s-nmstate-about-the-k8s-nmstate-operator.adoc#k8s-nmstate-about-the-k8s-nmstate-operator
23-
You must install the Kubernetes NMState Operator for live migration or external access to virtual machines (VMs).
19+
You must install the xref:../../networking/k8s_nmstate/k8s-nmstate-about-the-k8s-nmstate-operator.adoc#k8s-nmstate-about-the-k8s-nmstate-operator[Kubernetes NMState Operator] to configure a Linux bridge network for live migration or external access to virtual machines (VMs). For installation instructions, see xref:../../networking/k8s_nmstate/k8s-nmstate-about-the-k8s-nmstate-operator.adoc#installing-the-kubernetes-nmstate-operator-cli[Installing the Kubernetes NMState Operator by using the web console].
2420
endif::openshift-rosa,openshift-dedicated[]
2521

2622
ifndef::openshift-rosa,openshift-dedicated[]
27-
You can install the xref:../../networking/hardware_networks/about-sriov.adoc#about-sriov[SR-IOV Operator] to manage SR-IOV network devices and network attachments.
23+
You can install the xref:../../networking/hardware_networks/about-sriov.adoc#about-sriov[SR-IOV Operator] to manage SR-IOV network devices and network attachments. For installation instructions, see xref:../../networking/hardware_networks/installing-sriov-operator.adoc#installing-sriov-operator[Installing the SR-IOV Network Operator].
2824
endif::openshift-rosa,openshift-dedicated[]
2925

30-
include::modules/k8s-nmstate-installing-the-kubernetes-nmstate-operator.adoc[leveloffset=+2]
31-
32-
// Hiding in ROSA/OSD as dedicated-admin user cannot create the required namespace
3326
ifndef::openshift-rosa,openshift-dedicated[]
34-
include::modules/nw-sriov-installing-operator.adoc[leveloffset=+2]
27+
You can add the xref:../../networking/metallb/about-metallb.adoc#about-metallb[MetalLB Operator] to manage the lifecycle for an instance of MetalLB on your cluster. For installation instructions, see xref:../../networking/metallb/metallb-operator-install.adoc#metallb-operator-install[Installing the MetalLB Operator from the OperatorHub using the web console].
3528
endif::openshift-rosa,openshift-dedicated[]
3629

37-
// Hiding in ROSA/OSD as dedicated-admin user cannot create the required "nodenetworkconfigurationpolicies" resource
38-
ifndef::openshift-rosa,openshift-dedicated[]
3930
[id="configuring-linux-bridge-network"]
4031
== Configuring a Linux bridge network
4132

@@ -45,8 +36,10 @@ include::modules/virt-creating-linux-bridge-nncp.adoc[leveloffset=+2]
4536

4637
include::modules/virt-creating-linux-bridge-nad-web.adoc[leveloffset=+2]
4738

39+
ifndef::openshift-rosa,openshift-dedicated[]
4840
.Next steps
4941
* xref:../../virt/vm_networking/virt-connecting-vm-to-linux-bridge.adoc#virt-attaching-vm-secondary-network-cli_virt-connecting-vm-to-linux-bridge[Attaching a virtual machine (VM) to a Linux bridge network]
42+
endif::openshift-rosa,openshift-dedicated[]
5043

5144
[id="configuring-network-live-migration"]
5245
== Configuring a network for live migration
@@ -56,9 +49,7 @@ After you have configured a Linux bridge network, you can configure a dedicated
5649
include::modules/virt-configuring-secondary-network-vm-live-migration.adoc[leveloffset=+2]
5750

5851
include::modules/virt-selecting-migration-network-ui.adoc[leveloffset=+2]
59-
endif::openshift-rosa,openshift-dedicated[]
6052

61-
// Hiding in ROSA/OSD as dedicated-admin user cannot create the required namespace
6253
ifndef::openshift-rosa,openshift-dedicated[]
6354
[id="configuring-sriov-network"]
6455
== Configuring an SR-IOV network
@@ -75,4 +66,3 @@ include::modules/nw-sriov-network-attachment.adoc[leveloffset=+2]
7566
endif::openshift-rosa,openshift-dedicated[]
7667

7768
include::modules/virt-enabling-load-balancer-service-web.adoc[leveloffset=+1]
78-

0 commit comments

Comments
 (0)