Update roles

roles/oatakan.rhel_ovirt_template/README.md

@@ -50,8 +50,8 @@ Including an example of how to use your role (for instance, with variables passe
         export_ovf: no # export the template to export domain upon creation
         local_account_password: ''
         local_administrator_password: ''
-        linux_distro_name: rhel_81 # this needs to be one of the standard values see 'os_short_names' var
-        template_vm_name: rhel81-x64-v1
+        distro_name: rhel8 # this needs to be one of the standard values see 'os_short_names' var
+        template_vm_name: rhel84-x64-v1
         template_vm_root_disk_size: 10
         template_vm_memory: 4096
         template_vm_efi: false # you need to install efi file to use this, false should be fine in most cases

roles/oatakan.rhel_ovirt_template/defaults/main.yml

@@ -26,12 +26,12 @@ local_administrator_password: Chang3MyP@ssw0rd21
 local_account_username: ansible
 local_account_password: Chang3MyP@ssw0rd21
 
-linux_distro_name: rhel_77
-iso_file_name: CentOS-7-x86_64-DVD-1908.iso
-linux_ks_folder: rhel7
+distro_name: rhel8
+iso_file_name: CentOS-8.4.2105-x86_64-dvd1.iso
+linux_ks_folder: rhel8
 
-template_vm_name: centos77-x64-bigdisk_v1
-template_vm_root_disk_size: 300
+template_vm_name: centos84-x64-v1
+template_vm_root_disk_size: 10
 template_vm_root_disk_format: cow
 template_vm_root_disk_interface: virtio
 template_vm_memory: 4096
@@ -59,33 +59,9 @@ ovirt_export_domain: export_domain
 ovirt_iso_domain: iso_domain
 
 os_short_names:
-  rhel_77:
+  rhel7:
     ks_folder: rhel7
     guest_id: rhel_7x64
-  rhel_78:
-    ks_folder: rhel7
-    guest_id: rhel_7x64
-  rhel_80:
-    ks_folder: rhel8
-    guest_id: rhel_8x64
-  rhel_81:
-    ks_folder: rhel8
-    guest_id: rhel_8x64
-  rhel_82:
-    ks_folder: rhel8
-    guest_id: rhel_8x64
-  rhel_83:
-    ks_folder: rhel8
-    guest_id: rhel_8x64
-  centos_77:
-    ks_folder: rhel7
-    guest_id: rhel_7x64
-  centos_80:
-    ks_folder: rhel8
-    guest_id: rhel_8x64
-  centos_81:
-    ks_folder: rhel8
-    guest_id: rhel_8x64
-  centos_82:
+  rhel8:
     ks_folder: rhel8
     guest_id: rhel_8x64

roles/oatakan.rhel_ovirt_template/meta/.galaxy_install_info

@@ -1,2 +1,2 @@
-install_date: Wed May  5 16:14:09 2021
+install_date: Wed Jun 30 01:12:53 2021
 version: master

roles/oatakan.rhel_ovirt_template/tasks/datastore_upload.yml

@@ -2,7 +2,7 @@
 
 - name: validate file
   stat:
-    path: "{{ playbook_dir }}/{{ temp_directory }}/linux_{{ linux_distro_name }}_ks_autogen.iso"
+    path: "{{ playbook_dir }}/{{ temp_directory }}/linux_{{ distro_name }}_ks_autogen.iso"
     get_checksum: no
   register: iso_file_check
 

roles/oatakan.rhel_ovirt_template/tasks/make_iso.yml

@@ -14,7 +14,7 @@
       command: >
         mkisofs -U -A "OEMDRV" -V "OEMDRV"
         -volset "OEMDRV" -J -joliet-long -r -v -T
-        -o {{ playbook_dir }}/{{ temp_directory }}/linux_{{ linux_distro_name }}_ks_autogen.iso .
+        -o {{ playbook_dir }}/{{ temp_directory }}/linux_{{ distro_name }}_ks_autogen.iso .
       args:
         chdir: "{{ playbook_dir }}/{{ temp_directory }}/ks_iso"
 
@@ -25,5 +25,5 @@
         path: "{{ temp_directory }}/{{ item }}"
         state: absent
       loop:
-        - linux_{{ linux_distro_name }}_ks_autogen.iso
+        - linux_{{ distro_name }}_ks_autogen.iso
         - ks_iso/

roles/oatakan.rhel_ovirt_template/vars/main.yml

@@ -2,7 +2,7 @@
 
 temp_directory: tmp{{ awx_job_id | default('') }}
 
-iso_file: "linux_{{ linux_distro_name }}_ks{{ awx_job_id | default('') }}.iso"
+iso_file: "linux_{{ distro_name }}_ks{{ awx_job_id | default('') }}.iso"
 
 export_dir: "{{ playbook_dir }}/{{ temp_directory }}"
 
@@ -39,8 +39,8 @@ template:
       dns_servers: "{{ template_vm_dns_servers }}"
   cd_iso: "{{ iso_file_id | default(iso_file_name) }}"  # if using data domain, file name does not work, need to use id
 
-linux_ks_folder: "{{ os_short_names[(linux_distro_name|default('rhel_80'))].ks_folder | default('rhel8') }}"
-template_vm_guest_id: "{{ os_short_names[(linux_distro_name|default('rhel_80'))].guest_id | default('rhel_8x64') }}"
+linux_ks_folder: "{{ os_short_names[(distro_name|default('rhel_80'))].ks_folder | default('rhel8') }}"
+template_vm_guest_id: "{{ os_short_names[(distro_name|default('rhel_80'))].guest_id | default('rhel_8x64') }}"
 
 qemu_cmdline_second_iso:
   - -device