diff --git a/modules/virt-creating-configmap.adoc b/modules/virt-creating-configmap.adoc index f5e71c92a6..bded15888e 100644 --- a/modules/virt-creating-configmap.adoc +++ b/modules/virt-creating-configmap.adoc @@ -128,6 +128,7 @@ EOF $ oc get cm -n default os-configmap -o yaml ---- +ifeval::["{VirtVersion}" < "2.5"] . Edit the `kubevirt-hyperconverged-operator.v{HCOVersion}.yaml` file: + [source,terminal,subs="attributes+"] @@ -139,15 +140,15 @@ $ oc edit clusterserviceversion -n openshift-cnv kubevirt-hyperconverged-operato + [source,yaml] ---- - ... - spec: - containers: - - env: - ... - - name: OS_CONFIGMAP_NAME - value: os-configmap <1> - - name: OS_CONFIGMAP_NAMESPACE - value: default <2> +... +spec: + containers: + - env: + ... + - name: OS_CONFIGMAP_NAME + value: os-configmap <1> + - name: OS_CONFIGMAP_NAMESPACE + value: default <2> ---- <1> Add `value: os-configmap` to the `name: OS_CONFIGMAP_NAME` parameter. <2> Optional: You can add this value if you changed the namespace in the ConfigMap. @@ -155,6 +156,21 @@ $ oc edit clusterserviceversion -n openshift-cnv kubevirt-hyperconverged-operato . Save the `kubevirt-hyperconverged-operator.v{HCOVersion}.yaml` file. + Updating the `vm-import-operator` deployment updates the `vm-import-controller` ConfigMap. +endif::[] +ifeval::["{VirtVersion}" >= "2.5"] +. Patch the `vm-import-controller-config` ConfigMap to apply the new ConfigMap: ++ +[source,terminal] +---- +$ oc patch configmap vm-import-controller-config -n openshift-cnv --patch '{ + "data": { + "osConfigMap.name": "os-configmap", + "osConfigMap.namespace": "default" <1> + } +}' +---- +<1> Update the namespace if you changed it in the ConfigMap. +endif::[] . Verify that the template appears in the {VirtProductName} web console: diff --git a/virt/virtual_machines/importing_vms/virt-importing-rhv-vm.adoc b/virt/virtual_machines/importing_vms/virt-importing-rhv-vm.adoc index 50154157e6..0671bed341 100644 --- a/virt/virtual_machines/importing_vms/virt-importing-rhv-vm.adoc +++ b/virt/virtual_machines/importing_vms/virt-importing-rhv-vm.adoc @@ -12,14 +12,15 @@ include::modules/virt-importing-vm-prerequisites.adoc[leveloffset=+1] [discrete] include::modules/virt-features-for-storage-matrix.adoc[leveloffset=+2] -ifeval::["{VirtVersion}" == "2.4"] +ifeval::["{VirtVersion}" < "2.5"] include::modules/virt-checking-storage-class.adoc[leveloffset=+1] [discrete] include::modules/dynamic-provisioning-change-default-class.adoc[leveloffset=+2] -include::modules/virt-creating-configmap.adoc[leveloffset=+1] endif::[] +include::modules/virt-creating-configmap.adoc[leveloffset=+1] + == Importing a virtual machine include::modules/virt-importing-vm-wizard.adoc[leveloffset=+2]