Skip to content

Commit 2aab87a

Browse files
authored
Merge pull request #45883 from sjhala-ccs/cnv-4606
CNV-4606: Removing CNV nmstate content
2 parents d653ff2 + e3b11a6 commit 2aab87a

File tree

5 files changed

+18
-13
lines changed

5 files changed

+18
-13
lines changed

_topic_maps/_topic_map.yml

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3298,16 +3298,7 @@ Topics:
32983298
File: virt-managing-node-labeling-obsolete-cpu-models
32993299
- Name: Preventing node reconciliation
33003300
File: virt-preventing-node-reconciliation
3301-
# Node Networking
3302-
- Name: Node networking
3303-
Dir: node_network
3304-
Topics:
3305-
- Name: Observing node network state
3306-
File: virt-observing-node-network-state
3307-
- Name: Updating node network configuration
3308-
File: virt-updating-node-network-config
3309-
- Name: Troubleshooting node network configuration
3310-
File: virt-troubleshooting-node-network
3301+
# Removed the Node Networking content from the topic map because this section is now part of the OCP docs
33113302
# Logging, events, and monitoring
33123303
- Name: Logging, events, and monitoring
33133304
Dir: logging_events_monitoring

modules/virt-example-inherit-static-ip-from-nic.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Module included in the following assemblies:
22
//
3-
// * virt/node_network/virt-updating-node-network-config.adoc
3+
// * networking/k8s_nmstate/k8s-nmstate-updating-node-network-config.adoc
44

55
:_content-type: REFERENCE
66
[id="virt-example-inherit-static-ip-from-nic_{context}"]

networking/k8s_nmstate/k8s-nmstate-updating-node-network-config.adoc

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,5 +36,19 @@ include::modules/virt-example-ethernet-nncp.adoc[leveloffset=+2]
3636

3737
include::modules/virt-example-nmstate-multiple-interfaces.adoc[leveloffset=+2]
3838

39+
[id="capturing-nic-static-ip_k8s-nmstate-updating-node-network-config"]
40+
== Capturing the static IP of a NIC attached to a bridge
41+
42+
ifdef::openshift-enterprise[]
43+
:FeatureName: Capturing the static IP of a NIC
44+
include::snippets/technology-preview.adoc[leveloffset=+2]
45+
endif::[]
46+
47+
include::modules/virt-example-inherit-static-ip-from-nic.adoc[leveloffset=+2]
48+
49+
[role="_additional-resources"]
50+
.Additional resources
51+
* link:https://nmstate.io/nmpolicy/user-guide/102-policy-syntax.html[The NMPolicy project - Policy syntax]
52+
3953
// Dropping offset by one again
4054
include::modules/virt-example-nmstate-IP-management.adoc[leveloffset=+1]

virt/virt-learn-more-about-openshift-virtualization.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Use the following tables to find content to help you learn about and use {VirtPr
1717

1818
| xref:../virt/about-virt.adoc#about-virt[Learn about {VirtProductName}]
1919
| xref:../virt/install/preparing-cluster-for-virt.adoc#preparing-cluster-for-virt[Configuring your cluster for {VirtProductName}]
20-
| xref:../virt/node_network/virt-updating-node-network-config.adoc#virt-updating-node-network-config[Updating your node network configuration]
20+
| xref:../networking/k8s_nmstate/k8s-nmstate-updating-node-network-config.adoc#k8s-nmstate-updating-node-network-config[Updating your node network configuration]
2121
| xref:../virt/logging_events_monitoring/virt-collecting-virt-data.adoc#virt-collecting-virt-data[Getting Support]
2222

2323
| link:https://access.redhat.com/documentation/en-us/openshift_container_platform/[Learn more about {product-title}]

virt/virtual_machines/vm_networking/virt-attaching-vm-multiple-networks.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ include::modules/virt-networking-glossary.adoc[leveloffset=+1]
3636
include::modules/virt-creating-linux-bridge-nncp.adoc[leveloffset=+2]
3737

3838
For more information about scheduling, interface types, and other node networking activities,
39-
see the xref:../../../virt/node_network/virt-updating-node-network-config.adoc#virt-about-nmstate_virt-updating-node-network-config[node networking]
39+
see the xref:../../../networking/k8s_nmstate/k8s-nmstate-updating-node-network-config.adoc#k8s-nmstate-updating-node-network-config[node networking]
4040
section.
4141

4242
[id="virt-creating-network-attachment-definition"]

0 commit comments

Comments
 (0)