Revert "image_template: enable image template version name (oVirt#733)…

…" (oVirt#739) This reverts commit a2a8562.
denvist · Jan 30, 2024 · 1e9cb3d · 1e9cb3d
1 parent a2a8562
commit 1e9cb3d
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 13 deletions.
diff --git a/changelogs/fragments/733-enable-image-template-version-name.yml b/changelogs/fragments/733-enable-image-template-version-name.yml
diff --git a/roles/image_template/README.md b/roles/image_template/README.md
@@ -49,9 +49,6 @@ Role Variables
 | glance_image_provider        | UNDEF (mandatory if qcow_url is not used)            | Name of the glance image provider.                    |
 | glance_image            | UNDEF (mandatory if qcow_url is not used)               | This parameter specifies the name of disk in glance provider to be imported as template. |
 | template_prerequisites_tasks | UNDEF | Works only with qcow image. Specify a path to Ansible tasks file, which should be executed on virtual machine before creating a template from it. Note that qcow image must contain guest agent which reports IP address. |
-| template_version_name      | "base version" | Version name of the template. Allows to create different versions of a template.  |
-| template_description       | UNDEF | Sets the template description |
-| template_operating_system  | UNDEF | Sets the template Operative System |
 
 The `template_disks` List of dictionaries can contain following attributes:
 

diff --git a/roles/image_template/defaults/main.yml b/roles/image_template/defaults/main.yml
@@ -16,7 +16,6 @@ template_nics:
     profile_name: ovirtmgmt
     interface: virtio
 template_seal: true
-template_version_name: "base version"
 
 disk_resize_timeout: 60
 disk_storage_domain: null
diff --git a/roles/image_template/tasks/qcow2_image.yml b/roles/image_template/tasks/qcow2_image.yml
@@ -83,8 +83,7 @@
     - name: Check if template already exists
       ovirt_template_info:
         auth: "{{ ovirt_auth }}"
-        pattern: "name={{ template_name }} and datacenter={{ dc_info.ovirt_datacenters[0].name }}
-          and version_name=\"{{ template_version_name }}\""
+        pattern: "name={{ template_name }} and datacenter={{ dc_info.ovirt_datacenters[0].name }}"
       register: template_info
       tags:
         - ovirt-template-image
@@ -231,10 +230,6 @@
         cluster: "{{ template_cluster }}"
         timeout: "{{ template_timeout }}"
         seal: "{{ template_seal }}"
-        version:
-          name: "{{ template_version_name }}"
-        description: "{{ template_description | default(omit)}}"
-        operating_system: "{{ template_operating_system | default(omit)}}"
       when: template_info.ovirt_templates | length == 0
       tags:
         - ovirt-template-image