switch to the fyrev3vm_roles

ansible/roles/crc_fyrevm/tasks/crc_fyrevm.yml

@@ -1,41 +1,41 @@
 ---
 
 - name: Create FyreVM with appropriate spec
-  include_role: 
-   name: fyrevm_provision
+  ansible.builtin.include_role: 
+    name: fyrev3vm_provision
   vars:
-   fyre_platform: x
-   fyre_cpu: 6
-   fyre_memory: 32  
-   fyre_os: 'Redhat 8.2'
-   fyre_site: "{{ site }}"
-   fyre_comment: 'RH OpenShift crc'
-   clusterName_prefix: crc
-   target_group: crc
-   target_user: "{{ crc_username }}"
-   crc_username: "{{ crc_username }}"
-   vnc: "{{ vnc }}"
+    fyre_platform: x
+    fyre_cpu: 6
+    fyre_memory: 32  
+    fyre_os: 'Redhat 10.0'
+    fyre_site: "{{ site }}"
+    fyre_comment: 'RH OpenShift crc'
+    clusterName_prefix: crc
+    target_group: crc
+    target_user: "{{ crc_username }}"
+    crc_username: "{{ crc_username }}"
+    vnc: "{{ vnc }}"
 
 - block:
   - name: check the host for cpu type
-    command: 'ssh -o StrictHostKeyChecking=no root@{{ emberFQDN }} lscpu -J'
+    ansible.builtin.command: 'ssh -o StrictHostKeyChecking=no root@{{ emberFQDN }} lscpu -J'
     register: cpuType
 
   - set_fact: 
-     isAMDchip: "{{ (cpuType.stdout|from_json).lscpu[9].get('data') }}"
+      isAMDchip: "{{ (cpuType.stdout|from_json).lscpu[9].get('data') }}"
 
-  - debug: 
+  - ansible.builtin.debug: 
       msg: "{{ isAMDchip }}"
 
   - block:
     - name: is AMD?
       vars: 
-      - fyreRetryVM: True
+        fyreRetryVM: True
       include_role:
-        name: fyrevm_delete
+        name: fyrev3vm_delete
 
     - name: is AMD retry
-      include_role:
+      ansible.builtin.include_role:
         name: crc_fyrevm
     when: (isAMDchip).find('AMD') >= 1 
 

ansible/roles/db2_fyrevm/tasks/db2_fyrevm.yml

@@ -1,14 +1,14 @@
 ---
 - name: Create FyreVM with appropriate spec
-  include_role: 
-   name: fyrevm_provision
+  ansible.builtin.include_role: 
+    name: fyrev3vm_provision
   vars:
-   fyre_platform: x
-   fyre_cpu: 2
-   fyre_memory: 4 
-   fyre_os: 'Redhat 9.0'
-   fyre_site: "{{ site }}"
-   fyre_comment: 'RH Jmeter'
-   clusterName_prefix: db2
-   target_group: db2
-   vnc: "{{ vnc }}"
+    fyre_platform: x
+    fyre_cpu: 2
+    fyre_memory: 4 
+    fyre_os: 'Redhat 10.0'
+    fyre_site: "{{ site }}"
+    fyre_comment: 'RH Jmeter'
+    clusterName_prefix: db2
+    target_group: db2
+    vnc: "{{ vnc }}"

ansible/roles/instana_fyrevm/tasks/instana_fyrevm.yml

@@ -1,15 +1,15 @@
 ---
 
 - name: Create FyreVM with appropriate spec
-  include_role: 
-   name: fyrevm_provision
+  ansible.builtin.include_role: 
+    name: fyrev3vm_provision
   vars:
-   fyre_platform: x
-   fyre_cpu: 16
-   fyre_memory: 64
-   fyre_additional_disk: 2048
-   fyre_os: 'RedHat 9.0'
-   fyre_site: "{{ site }}"
-   fyre_comment: 'Instana Host'
-   clusterName_prefix: instana
-   target_group: instana
+    fyre_platform: x
+    fyre_cpu: 16
+    fyre_memory: 64
+    fyre_additional_disk: 2048
+    fyre_os: 'RedHat 10.0'
+    fyre_site: "{{ site }}"
+    fyre_comment: 'Instana Host'
+    clusterName_prefix: instana
+    target_group: instana

ansible/roles/jmeter_fyrevm/tasks/jmeter_fyrevm.yml

@@ -1,17 +1,17 @@
 ---
 
 - name: Create FyreVM with appropriate spec
-  include_role: 
-   name: fyrevm_provision
+  ansible.builtin.include_role: 
+    name: fyrev3vm_provision
   vars:
-   fyre_platform: x
-   fyre_cpu: 2
-   fyre_memory: 2  
-   fyre_os: 'Redhat 9.0'
-   fyre_site: "{{ site }}"
-   fyre_comment: 'RH Jmeter'
-   clusterName_prefix: crc
-   target_group: jmeter
-   target_user: "{{ jmeterUser }}"
-   jmeterUser: "{{ jmeterUser }}"
-   vnc: "{{ vnc }}"
+    fyre_platform: x
+    fyre_cpu: 2
+    fyre_memory: 2  
+    fyre_os: 'Redhat 10.0'
+    fyre_site: "{{ site }}"
+    fyre_comment: 'RH Jmeter'
+    clusterName_prefix: crc
+    target_group: jmeter
+    target_user: "{{ jmeterUser }}"
+    jmeterUser: "{{ jmeterUser }}"
+    vnc: "{{ vnc }}"

ansible/roles/pentest_fyrevm/tasks/pentest_fyrevm.yml

@@ -1,14 +1,14 @@
 ---
 
 - name: Create FyreVM with appropriate spec
-  include_role: 
-   name: fyrevm_provision
+  ansible.builtin.include_role: 
+    name: fyrev3vm_provision
   vars:
-   fyre_platform: x
-   fyre_cpu: 2 
-   fyre_memory: 4
-   fyre_os: 'RedHat 9.0'
-   fyre_site: "{{ site }}"
-   fyre_comment: 'Pentest Host'
-   clusterName_prefix: pentest
-   target_group: pentest
+    fyre_platform: x
+    fyre_cpu: 2 
+    fyre_memory: 4
+    fyre_os: 'RedHat 10.0'
+    fyre_site: "{{ site }}"
+    fyre_comment: 'Pentest Host'
+    clusterName_prefix: pentest
+    target_group: pentest