Merge pull request #63579 from apinnick/move-vm-templates

remove vm templates section

Author: apinnick

_topic_maps/_topic_map.yml

@@ -3682,6 +3682,10 @@ Topics:
     File: virt-using-vtpm-devices
   - Name: Managing virtual machines with OpenShift Pipelines
     File: virt-managing-vms-openshift-pipelines
+  - Name: Managing automatic boot source updates
+    File: virt-automatic-bootsource-updates
+  - Name: Creating custom boot sources
+    File: virt-creating-and-using-boot-sources
   - Name: Advanced virtual machine management
     Dir: advanced_vm_management
     Topics:
@@ -3801,25 +3805,6 @@ Topics:
     File: virt-accessing-vm-secondary-network-fqdn
   - Name: Managing MAC address pools for network interfaces
     File: virt-using-mac-address-pool-for-vms
-# Templates
-- Name: Virtual machine templates
-  Dir: vm_templates
-  Topics:
-  - Name: Creating virtual machine templates
-    File: virt-creating-vm-template
-  - Name: Editing virtual machine templates
-    File: virt-editing-vm-template
-  - Name: Enabling dedicated resources for a virtual machine template
-    File: virt-dedicated-resources-vm-template
-  - Name: Deploying a virtual machine template to a custom namespace
-    File: virt-deploying-vm-template-to-custom-namespace
-  - Name: Deleting a virtual machine template
-    File: virt-deleting-vm-template
-  - Name: Creating and using boot sources
-    File: virt-creating-and-using-boot-sources
-  - Name: Managing automatic boot source updates
-    File: virt-automatic-bootsource-updates
-    Distros: openshift-enterprise
 # Virtual machine live migration
 - Name: Live migration
   Dir: live_migration

modules/virt-about-auto-bootsource-updates.adoc

@@ -1,6 +1,6 @@
 // Module included in the following assembly:
 //
-// * virt/vm_templates/virt-automatic-bootsource-updates.adoc
+// * virt/virtual_machines/virt-creating-and-using-boot-sources.adoc
 //
 
 :_content-type: CONCEPT

modules/virt-about-dedicated-resources.adoc

@@ -1,7 +1,6 @@
 // Module included in the following assemblies:
 //
 // * virt/virtual_machines/advanced_vm_management/virt-dedicated-resources-vm.adoc
-// * virt/vm_templates/virt-dedicated-resources-vm-template.adoc
 
 :_content-type: CONCEPT
 [id="virt-about-dedicated-resources_{context}"]

modules/virt-about-vm-templates.adoc

@@ -1,7 +1,7 @@
 // Module included in the following assemblies:
 //
 // * virt/virtual_machines/virtual_disks/virt-creating-and-using-boot-sources.adoc
-// * virt/vm_templates/virt-creating-vm-template.adoc
+
 
 :_content-type: CONCEPT
 [id="virt-about-vms-and-boot-sources_{context}"]

modules/virt-about-vms-and-boot-sources.adoc

@@ -1,41 +1,20 @@
 // Module included in the following assemblies:
 //
 // * virt/virtual_machines/virt-edit-vms.adoc
-// * virt/vm_templates/virt-editing-vm-template.adoc
-
-// Establishing conditionals so content can be re-used for editing VMs
-// and VM templates.
-
-ifeval::["{context}" == "virt-edit-vms"]
-:virt-vm:
-:object: virtual machine
-:object-gui: VirtualMachines
-:object-vm-overview: VirtualMachine details
-:tab: Configuration -> Disks
-endif::[]
-
-ifeval::["{context}" == "virt-editing-vm-template"]
-:virt-vm-template:
-:object: virtual machine template
-:object-gui: Templates
-:object-vm-overview: Template details
-:tab: Disks
-endif::[]
 
 :_content-type: PROCEDURE
 [id="virt-add-disk-to-vm_{context}"]
 
-= Adding a virtual disk to a {object}
+= Adding a disk to a virtual machine
 
-Use this procedure to add a virtual disk to a {object}.
+You can add a virtual disk to a virtual machine (VM) by using the {product-title} web console.
 
 .Procedure
 
-. Click *Virtualization* -> *{object-gui}* from the side menu.
-
-. Select a {object} to open the *{object-vm-overview}* page.
+. Navigate to *Virtualization* -> *VirtualMachines* in the web console.
+. Select a VM to open the *VirtualMachine details* page.
 
-. On the *{tab}* tab, click *Add disk*.
+. On the *Disks* tab, click *Add disk*.
 
 . Specify the *Source*, *Name*, *Size*, *Type*, *Interface*, and *Storage Class*.
 
@@ -45,27 +24,8 @@ Use this procedure to add a virtual disk to a {object}.
 
 . Click *Add*.
 
-ifdef::virt-vm[]
 [NOTE]
 ====
-If the {object} is running, the new disk is in the *pending restart* state and will not be attached until you restart the {object}.
-
-The *Pending Changes* banner at the top of the page displays a list of all changes that will be applied when the {object} restarts.
+If the VM is running, you must restart the VM to apply the change.
 ====
-endif::virt-vm[]
-
-// Unsetting all conditionals used in module
-
-ifeval::["{context}" == "virt-edit-vms"]
-:virt-vm!:
-:object!:
-:object-gui!:
-:object-vm-overview!:
-endif::[]
 
-ifeval::["{context}" == "virt-editing-vm-template"]
-:virt-vm-template!:
-:object!:
-:object-gui!:
-:object-vm-overview!:
-endif::[]

modules/virt-add-disk-to-vm.adoc

@@ -1,12 +1,11 @@
 // Module included in the following assemblies:
 //
-// * virt/vm_templates/virt-creating-vm-template.adoc
 
 :_content-type: PROCEDURE
 [id="virt-adding-a-boot-source-web_{context}"]
-= Adding a boot source for a virtual machine template
+= Adding boot source to a template
 
-A boot source can be configured for any virtual machine template that you want to use for creating virtual machines or custom templates. When virtual machine templates are configured with a boot source, they are labeled *Source available* on the *Templates* page. After you add a boot source to a template, you can create a new virtual machine from the template.
+You can add a boot source or operating system image to a virtual machine (VM) template. When templates are configured with an operating system image, they are labeled *Source available* on the *Catalog* page. After you add a boot source to a template, you can create a VM from the template.
 
 There are four methods for selecting and adding a boot source in the web console:
 
@@ -16,19 +15,18 @@ There are four methods for selecting and adding a boot source in the web console
 * *Registry (creates PVC)*
 
 .Prerequisites
-* To add a boot source, you must be logged in as a user with the `os-images.kubevirt.io:edit` RBAC role or as an administrator. You do not need special privileges to create a virtual machine from a template with a boot source added.
-
-* To upload a local file, the operating system image file must exist on your local machine.
-
-* To import via URL, access to the web server with the operating system image is required. For example: the Red Hat Enterprise Linux web page with images.
 
+* You must be logged in as a user with the `os-images.kubevirt.io:edit` RBAC role or as an administrator.
++
+You do not need special privileges to create a VM from a template with an operating system image added.
+* To upload a local file, the boot source file must exist on your local machine.
+* To download from a URL endpoint, you must have access to the web server with the boot source. For example: the Red Hat Enterprise Linux web page with images.
 * To clone an existing PVC, access to the project with a PVC is required.
-
-* To import via registry, access to the container registry is required.
+* To download a boot source from a registry, access to the container registry is required.
 
 .Procedure
 
-. In the {product-title} console, click *Virtualization* -> *Templates* from the side menu.
+. In the {product-title} console, click *Virtualization* -> *Catalog* from the side menu.
 . Click the options menu beside a template and select *Edit boot source*.
 . Click *Add disk*.
 . In the *Add disk* window, select *Use this disk as a boot source*.
@@ -47,9 +45,7 @@ Provided boot sources are updated automatically to the latest version of the ope
 . Select the appropriate method to save your boot source:
 
 .. Click *Save and upload* if you uploaded a local file.
-
 .. Click *Save and import* if you imported content from a URL or the registry.
-
 .. Click *Save and clone* if you cloned an existing PVC.
 
 Your custom virtual machine template with a boot source is listed on the *Catalog* page. You can use this template to create a virtual machine.

modules/virt-add-nic-to-vm.adoc

@@ -1,6 +1,6 @@
 // Module included in the following assembly:
 //
-// * virt/vm_templates/virt-automatic-bootsource-updates.adoc
+// * virt/virtual_machines/virt-automatic-bootsource-updates.adoc
 //
 
 :_content-type: PROCEDURE