From eec8499a5b401ed619bc4132f6f7f65566125199 Mon Sep 17 00:00:00 2001 From: matt Date: Mon, 11 Aug 2025 13:36:37 -0600 Subject: [PATCH] now with longer names --- .../demo/cloud/roles/aws/tasks/restore_vm.yml | 4 ++-- .../demo/cloud/roles/aws/tasks/snapshot_vm.yml | 8 ++++---- .../demo/openshift/roles/eda_controller/tasks/main.yml | 10 +++++----- .../demo/openshift/roles/snapshot/tasks/create.yml | 6 +++--- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/collections/ansible_collections/demo/cloud/roles/aws/tasks/restore_vm.yml b/collections/ansible_collections/demo/cloud/roles/aws/tasks/restore_vm.yml index 730ecad..a36f6a6 100644 --- a/collections/ansible_collections/demo/cloud/roles/aws/tasks/restore_vm.yml +++ b/collections/ansible_collections/demo/cloud/roles/aws/tasks/restore_vm.yml @@ -10,14 +10,14 @@ wait: true - name: AWS | RESTORE VM | get volumes - register: r_vol_info + register: aws_r_vol_info amazon.aws.ec2_vol_info: region: "{{ aws_region }}" filters: attachment.instance-id: "{{ instance_id }}" - name: AWS | RESTORE VM | detach volumes - loop: "{{ r_vol_info.volumes }}" + loop: "{{ aws_r_vol_info.volumes }}" loop_control: loop_var: volume label: "{{ volume.id }}" diff --git a/collections/ansible_collections/demo/cloud/roles/aws/tasks/snapshot_vm.yml b/collections/ansible_collections/demo/cloud/roles/aws/tasks/snapshot_vm.yml index 0826f8c..d581477 100644 --- a/collections/ansible_collections/demo/cloud/roles/aws/tasks/snapshot_vm.yml +++ b/collections/ansible_collections/demo/cloud/roles/aws/tasks/snapshot_vm.yml @@ -12,14 +12,14 @@ file: snapshot_vm.yml - name: AWS | SNAPSHOT VM | get volumes - register: r_vol_info + register: aws_r_vol_info amazon.aws.ec2_vol_info: region: "{{ aws_region }}" filters: attachment.instance-id: "{{ instance_id }}" - name: AWS | SNAPSHOT VM | take snapshots - loop: "{{ r_vol_info.volumes }}" + loop: "{{ aws_r_vol_info.volumes }}" loop_control: loop_var: volume label: "{{ volume.id }}" @@ -32,11 +32,11 @@ - name: AWS | SNAPSHOT VM | format snapshot stat ansible.builtin.set_fact: - snapshot_stat: + aws_snapshot_stat: - key: "{{ inventory_hostname }}" value: "{{ r_snapshots.results | json_query(aws_ec2_snapshot_query) }}" - name: AWS | SNAPSHOT VM | record snapshot with host key ansible.builtin.set_stats: data: - aws_snapshots: "{{ snapshot_stat | items2dict }}" + aws_snapshots: "{{ aws_snapshot_stat | items2dict }}" diff --git a/collections/ansible_collections/demo/openshift/roles/eda_controller/tasks/main.yml b/collections/ansible_collections/demo/openshift/roles/eda_controller/tasks/main.yml index 9c95b05..963470d 100644 --- a/collections/ansible_collections/demo/openshift/roles/eda_controller/tasks/main.yml +++ b/collections/ansible_collections/demo/openshift/roles/eda_controller/tasks/main.yml @@ -17,14 +17,14 @@ kind: Route name: "{{ eda_controller_project_app_name }}" namespace: "{{ eda_controller_project }}" - register: r_eda_route - until: r_eda_route.resources[0].spec.host is defined + register: eda_controller_r_eda_route + until: eda_controller_r_eda_route.resources[0].spec.host is defined retries: 30 delay: 45 - name: Get eda-controller route hostname ansible.builtin.set_fact: - eda_controller_hostname: "{{ r_eda_route.resources[0].spec.host }}" + eda_controller_hostname: "{{ eda_controller_r_eda_route.resources[0].spec.host }}" - name: Wait for eda_controller to be running ansible.builtin.uri: @@ -36,8 +36,8 @@ validate_certs: false body_format: json status_code: 200 - register: r_result - until: not r_result.failed + register: eda_controller_r_result + until: not eda_controller_r_result.failed retries: 60 delay: 45 diff --git a/collections/ansible_collections/demo/openshift/roles/snapshot/tasks/create.yml b/collections/ansible_collections/demo/openshift/roles/snapshot/tasks/create.yml index 89cb419..8d4fdd0 100644 --- a/collections/ansible_collections/demo/openshift/roles/snapshot/tasks/create.yml +++ b/collections/ansible_collections/demo/openshift/roles/snapshot/tasks/create.yml @@ -3,7 +3,7 @@ redhat.openshift_virtualization.kubevirt_vm_info: name: "{{ item }}" namespace: "{{ vm_namespace }}" - register: state + register: snapshot_state - name: Stop VirtualMachine redhat.openshift_virtualization.kubevirt_vm: @@ -11,7 +11,7 @@ namespace: "{{ vm_namespace }}" running: false wait: true - when: state.resources.0.spec.running + when: snapshot_state.resources.0.spec.running - name: Create a VirtualMachineSnapshot kubernetes.core.k8s: @@ -37,7 +37,7 @@ namespace: "{{ vm_namespace }}" running: true wait: true - when: state.resources.0.spec.running + when: snapshot_state.resources.0.spec.running - name: Export snapshot name ansible.builtin.set_stats: