From 8c4abf6a65f978e779a787f413e1bfa578f1b07f Mon Sep 17 00:00:00 2001 From: Andrija Panic <45762285+andrijapanicsb@users.noreply.github.com> Date: Tue, 16 Jan 2024 18:30:57 +0100 Subject: [PATCH 1/5] Update ManageInstances.vue --- ui/src/views/tools/ManageInstances.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/src/views/tools/ManageInstances.vue b/ui/src/views/tools/ManageInstances.vue index c7913cabbe49..968c3dd10193 100644 --- a/ui/src/views/tools/ManageInstances.vue +++ b/ui/src/views/tools/ManageInstances.vue @@ -576,7 +576,7 @@ export default { }, { name: 'local', - label: 'Import QCOW image from Local Storage', + label: 'Import QCOW2 image from Local Storage', sourceDestHypervisors: { kvm: 'kvm' }, @@ -585,7 +585,7 @@ export default { }, { name: 'shared', - label: 'Import QCOW image from Shared Storage', + label: 'Import QCOW2 image from Shared Storage', sourceDestHypervisors: { kvm: 'kvm' }, From f77c3c8adf6a9dace47913c1ecd97d2337cc177c Mon Sep 17 00:00:00 2001 From: Andrija Panic <45762285+andrijapanicsb@users.noreply.github.com> Date: Tue, 16 Jan 2024 18:32:42 +0100 Subject: [PATCH 2/5] Update en.json --- ui/public/locales/en.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/public/locales/en.json b/ui/public/locales/en.json index 443b086f580c..c72ca5fc0cc6 100644 --- a/ui/public/locales/en.json +++ b/ui/public/locales/en.json @@ -676,8 +676,8 @@ "label.desc.db.stats": "Database Statistics", "label.desc.importexportinstancewizard": "Import and export Instances to/from an existing VMware or KVM cluster.", "label.desc.import.ext.kvm.wizard": "Import libvirt domain from KVM Host", -"label.desc.import.local.kvm.wizard": "Import QCOW image from Local Storage", -"label.desc.import.shared.kvm.wizard": "Import QCOW image from Shared Storage", +"label.desc.import.local.kvm.wizard": "Import QCOW2 image from Local Storage", +"label.desc.import.shared.kvm.wizard": "Import QCOW2 image from Shared Storage", "label.desc.ingesttinstancewizard": "Ingest instances from an external KVM host", "label.desc.importmigratefromvmwarewizard": "Import instances from VMware into a KVM cluster", "label.desc.usage.stats": "Usage Server Statistics", From fe5b231e530474e172d75d3e151fb56c2d869cce Mon Sep 17 00:00:00 2001 From: Andrija Panic <45762285+andrijapanicsb@users.noreply.github.com> Date: Tue, 16 Jan 2024 18:36:06 +0100 Subject: [PATCH 3/5] Update en.json --- ui/public/locales/en.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/public/locales/en.json b/ui/public/locales/en.json index c72ca5fc0cc6..012b014c5687 100644 --- a/ui/public/locales/en.json +++ b/ui/public/locales/en.json @@ -2699,8 +2699,8 @@ "message.desc.host": "Each cluster must contain at least one host (computer) for guest Instances to run on. We will add the first host now. For a host to function in CloudStack, you must install hypervisor software on the host, assign an IP address to the host, and ensure the host is connected to the CloudStack management server.

Give the host's DNS or IP address, the user name (usually root) and password, and any labels you use to categorize hosts.", "message.desc.importingestinstancewizard": "This feature only applies to libvirt based KVM instances. Only Stopped instances can be ingested", "message.desc.import.ext.kvm.wizard": "Import libvirt domain from External KVM Host not managed by CloudStack", -"message.desc.import.local.kvm.wizard": "Import QCOW image from Local Storage of selected KVM Host", -"message.desc.import.shared.kvm.wizard": "Import QCOW image from selected Primary Storage Pool", +"message.desc.import.local.kvm.wizard": "Import QCOW2 image from Local Storage of selected KVM Host", +"message.desc.import.shared.kvm.wizard": "Import QCOW2 image from selected Primary Storage Pool", "message.desc.importexportinstancewizard": "By choosing to manage an Instance, CloudStack takes over the orchestration of that Instance. Unmanaging an Instance removes CloudStack ability to manage it. In both cases, the Instance is left running and no changes are done to the VM on the hypervisor.

For KVM, managing a VM is an experimental feature.", "message.desc.importmigratefromvmwarewizard": "By selecting an existing or external VMware Datacenter and an instance to import, CloudStack migrates the selected instance from VMware to KVM on a conversion host using virt-v2v and imports it into a KVM cluster", "message.desc.primary.storage": "Each cluster must contain one or more primary storage servers. We will add the first one now. Primary storage contains the disk volumes for all the Instances running on hosts in the cluster. Use any standards-compliant protocol that is supported by the underlying hypervisor.", From 33a8acd3beed7db1c0cc7187c5c2ccb7fe4d7727 Mon Sep 17 00:00:00 2001 From: Andrija Panic <45762285+andrijapanicsb@users.noreply.github.com> Date: Tue, 16 Jan 2024 18:56:27 +0100 Subject: [PATCH 4/5] Update en.json --- ui/public/locales/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/public/locales/en.json b/ui/public/locales/en.json index 012b014c5687..b86e39aba7b2 100644 --- a/ui/public/locales/en.json +++ b/ui/public/locales/en.json @@ -675,7 +675,7 @@ "label.deploymentplanner": "Deployment planner", "label.desc.db.stats": "Database Statistics", "label.desc.importexportinstancewizard": "Import and export Instances to/from an existing VMware or KVM cluster.", -"label.desc.import.ext.kvm.wizard": "Import libvirt domain from KVM Host", +"label.desc.import.ext.kvm.wizard": "Import Instance from remote KVM host", "label.desc.import.local.kvm.wizard": "Import QCOW2 image from Local Storage", "label.desc.import.shared.kvm.wizard": "Import QCOW2 image from Shared Storage", "label.desc.ingesttinstancewizard": "Ingest instances from an external KVM host", From 1b83ce37703a11e41f79e814771fd2c9f0353970 Mon Sep 17 00:00:00 2001 From: Andrija Panic <45762285+andrijapanicsb@users.noreply.github.com> Date: Tue, 16 Jan 2024 18:58:11 +0100 Subject: [PATCH 5/5] Update ManageInstances.vue --- ui/src/views/tools/ManageInstances.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/src/views/tools/ManageInstances.vue b/ui/src/views/tools/ManageInstances.vue index 968c3dd10193..a869768bf391 100644 --- a/ui/src/views/tools/ManageInstances.vue +++ b/ui/src/views/tools/ManageInstances.vue @@ -567,7 +567,7 @@ export default { }, { name: 'external', - label: 'Import libvirt domain from KVM Host', + label: 'Import Instance from remote KVM host', sourceDestHypervisors: { kvm: 'kvm' },