From 4a46c9f971371b7f22c05549e0f11c362322d68d Mon Sep 17 00:00:00 2001 From: Steven Schader Date: Wed, 16 Jul 2025 13:11:07 -0500 Subject: [PATCH 1/2] switch to the fyrev3vm_roles --- .ansible/.lock | 0 ansible/roles/crc_fyrevm/tasks/crc_fyrevm.yml | 38 +++++++++---------- ansible/roles/db2_fyrevm/tasks/db2_fyrevm.yml | 22 +++++------ .../instana_fyrevm/tasks/instana_fyrevm.yml | 22 +++++------ .../jmeter_fyrevm/tasks/jmeter_fyrevm.yml | 26 ++++++------- .../pentest_fyrevm/tasks/pentest_fyrevm.yml | 20 +++++----- 6 files changed, 64 insertions(+), 64 deletions(-) create mode 100644 .ansible/.lock diff --git a/.ansible/.lock b/.ansible/.lock new file mode 100644 index 000000000..e69de29bb diff --git a/ansible/roles/crc_fyrevm/tasks/crc_fyrevm.yml b/ansible/roles/crc_fyrevm/tasks/crc_fyrevm.yml index 48a5ed5d4..6306b76b0 100644 --- a/ansible/roles/crc_fyrevm/tasks/crc_fyrevm.yml +++ b/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 diff --git a/ansible/roles/db2_fyrevm/tasks/db2_fyrevm.yml b/ansible/roles/db2_fyrevm/tasks/db2_fyrevm.yml index c8ec09719..ca68e614b 100644 --- a/ansible/roles/db2_fyrevm/tasks/db2_fyrevm.yml +++ b/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 }}" diff --git a/ansible/roles/instana_fyrevm/tasks/instana_fyrevm.yml b/ansible/roles/instana_fyrevm/tasks/instana_fyrevm.yml index 0d2f267ea..7e6e96ee1 100644 --- a/ansible/roles/instana_fyrevm/tasks/instana_fyrevm.yml +++ b/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 diff --git a/ansible/roles/jmeter_fyrevm/tasks/jmeter_fyrevm.yml b/ansible/roles/jmeter_fyrevm/tasks/jmeter_fyrevm.yml index c548b65ba..935b52925 100644 --- a/ansible/roles/jmeter_fyrevm/tasks/jmeter_fyrevm.yml +++ b/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 }}" diff --git a/ansible/roles/pentest_fyrevm/tasks/pentest_fyrevm.yml b/ansible/roles/pentest_fyrevm/tasks/pentest_fyrevm.yml index fe1432ba6..e81b26ba9 100644 --- a/ansible/roles/pentest_fyrevm/tasks/pentest_fyrevm.yml +++ b/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 From ff0ee222c523273c7a586d545ae54b5395c0c982 Mon Sep 17 00:00:00 2001 From: Steven Schader Date: Wed, 16 Jul 2025 13:15:39 -0500 Subject: [PATCH 2/2] Delete .ansible/.lock --- .ansible/.lock | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 .ansible/.lock diff --git a/.ansible/.lock b/.ansible/.lock deleted file mode 100644 index e69de29bb..000000000