style: update files to conform with new lint behavior

Signed-off-by: Gerard Vanloo <gerard.vanloo@ibm.com>

Author: Red-GV

sre/dev/remote_cluster/roles/awx/tasks/create_async.yaml

@@ -5,18 +5,18 @@
     cidr_block: "{{ awx_stack.runners.aws.vpc.cidr }}"
     region: "{{ awx_cluster.aws.region }}"
     state: present
-  register: vpc_info
+  register: awx_vpc_info
 
 - name: Create an Internet Gateway associated with VPC
   amazon.aws.ec2_vpc_igw:
-    vpc_id: "{{ vpc_info.vpc.id }}"
+    vpc_id: "{{ awx_vpc_info.vpc.id }}"
     region: "{{ awx_cluster.aws.region }}"
     state: present
-  register: igw_info
+  register: awx_igw_info
 
 - name: Create a subnet for each cluster
   amazon.aws.ec2_vpc_subnet:
-    vpc_id: "{{ vpc_info.vpc.id }}"
+    vpc_id: "{{ awx_vpc_info.vpc.id }}"
     cidr: "{{ awx_stack.runners.aws.subnet.public_base }}.{{ item * 2 }}.0/23"
     az: "{{ awx_cluster.aws.zones[0] }}"
     region: "{{ awx_cluster.aws.region }}"
@@ -26,21 +26,21 @@
       Name: "{{ awx_stack.name_prefix }}-public-subnet-{{ item }}"
       Environment: k8s
       ManagedBy: ansible
-  loop: "{{ range(1, (cluster_names | length) + 1) }}"
-  register: public_subnets
+  loop: "{{ range(1, (awx_cluster_names | length) + 1) }}"
+  register: awx_public_subnets
 
 - name: Parse subnet ids
   ansible.builtin.set_fact:
-    subnet_ids: "{{ public_subnets.results | community.general.json_query('[*].subnet.id') }}"
+    subnet_ids: "{{ awx_public_subnets.results | community.general.json_query('[*].subnet.id') }}"
 
 - name: Create a route table for public subnets
   amazon.aws.ec2_vpc_route_table:
-    vpc_id: "{{ vpc_info.vpc.id }}"
+    vpc_id: "{{ awx_vpc_info.vpc.id }}"
     region: "{{ awx_cluster.aws.region }}"
     subnets: "{{ subnet_ids }}"
     routes:
       - dest: "0.0.0.0/0"
-        gateway_id: "{{ igw_info.gateway_id }}"
+        gateway_id: "{{ awx_igw_info.gateway_id }}"
     tags:
       Name: "{{ awx_stack.name_prefix }}-public-route-table"
       Creator: "ansible"
@@ -58,7 +58,7 @@
       - --topology
       - public
       - --network-id
-      - "{{ vpc_info.vpc.id }}"
+      - "{{ awx_vpc_info.vpc.id }}"
       - --subnets
       - "{{ item[1] }}"
       - --zones
@@ -76,16 +76,16 @@
       - --networking
       - "{{ awx_cluster.networking.mode }}"
       - --state
-      - "{{ state_store }}"
+      - "{{ awx_kops_state_store }}"
   async: 600
-  loop: "{{ cluster_names | zip(subnet_ids) }}"
+  loop: "{{ awx_cluster_names | zip(subnet_ids) }}"
   poll: 0
-  register: async_create_results
+  register: awx_async_create_results
 
 - name: Wait for asynchronous operations to complete
   ansible.builtin.async_status:
     jid: "{{ item.ansible_job_id }}"
-  loop: "{{ async_create_results.results }}"
+  loop: "{{ awx_async_create_results.results }}"
   register: async_create_poll_results
   until: async_create_poll_results.finished
   delay: 30
@@ -95,7 +95,7 @@
   ansible.builtin.async_status:
     mode: cleanup
     jid: "{{ item.ansible_job_id }}"
-  loop: "{{ async_create_results.results }}"
+  loop: "{{ awx_async_create_results.results }}"
 
 - name: Asynchronously build kOps clusters
   ansible.builtin.command:
@@ -106,19 +106,19 @@
       - --name
       - "{{ item }}"
       - --state
-      - "{{ state_store }}"
+      - "{{ awx_kops_state_store }}"
       - --yes
       - --internal
       - --create-kube-config=false
   async: 600
-  loop: "{{ cluster_names }}"
+  loop: "{{ awx_cluster_names }}"
   poll: 0
-  register: async_update_results
+  register: awx_async_update_results
 
 - name: Wait for asynchronous operations to complete
   ansible.builtin.async_status:
     jid: "{{ item.ansible_job_id }}"
-  loop: "{{ async_update_results.results }}"
+  loop: "{{ awx_async_update_results.results }}"
   register: async_update_poll_results
   until: async_update_poll_results.finished
   delay: 30
@@ -128,7 +128,7 @@
   ansible.builtin.async_status:
     mode: cleanup
     jid: "{{ item.ansible_job_id }}"
-  loop: "{{ async_update_results.results }}"
+  loop: "{{ awx_async_update_results.results }}"
 
 - name: Export the kubeconfigs for the clusters
   ansible.builtin.command:
@@ -140,12 +140,12 @@
       - kubecfg
       - --admin
       - --state
-      - "{{ state_store }}"
+      - "{{ awx_kops_state_store }}"
       - --kubeconfig
       - /tmp/{{ item }}.yaml
-  loop: "{{ cluster_names }}"
-  register: export_kops_output
-  changed_when: export_kops_output.rc == 0
+  loop: "{{ awx_cluster_names }}"
+  register: awx_kops_export_output
+  changed_when: awx_kops_export_output.rc == 0
 
 - name: Asynchronously validate kOps cluster
   ansible.builtin.command:
@@ -154,20 +154,20 @@
       - validate
       - cluster
       - --state
-      - "{{ state_store }}"
+      - "{{ awx_kops_state_store }}"
       - --wait
       - 10m
   environment:
     KUBECONFIG: /tmp/{{ item }}.yaml
   async: 600
-  loop: "{{ cluster_names }}"
+  loop: "{{ awx_cluster_names }}"
   poll: 0
-  register: async_validate_results
+  register: awx_async_validate_results
 
 - name: Wait for asynchronous operations to complete
   ansible.builtin.async_status:
     jid: "{{ item.ansible_job_id }}"
-  loop: "{{ async_validate_results.results }}"
+  loop: "{{ awx_async_validate_results.results }}"
   register: async_validate_poll_results
   until: async_validate_poll_results.finished
   delay: 60
@@ -177,4 +177,4 @@
   ansible.builtin.async_status:
     mode: cleanup
     jid: "{{ item.ansible_job_id }}"
-  loop: "{{ async_validate_results.results }}"
+  loop: "{{ awx_async_validate_results.results }}"

sre/dev/remote_cluster/roles/awx/tasks/delete_async.yaml

@@ -9,16 +9,16 @@
       - "{{ item }}"
       - --yes
       - --state
-      - "{{ state_store }}"
+      - "{{ awx_kops_state_store }}"
   async: 900
-  loop: "{{ cluster_names }}"
+  loop: "{{ awx_cluster_names }}"
   poll: 0
-  register: async_delete_results
+  register: awx_async_delete_results
 
 - name: Wait for asynchronous operations to complete
   ansible.builtin.async_status:
     jid: "{{ item.ansible_job_id }}"
-  loop: "{{ async_delete_results.results }}"
+  loop: "{{ awx_async_delete_results.results }}"
   register: async_delete_poll_results
   until: async_delete_poll_results.finished
   delay: 30
@@ -28,30 +28,30 @@
   ansible.builtin.async_status:
     mode: cleanup
     jid: "{{ item.ansible_job_id }}"
-  loop: "{{ async_delete_results.results }}"
+  loop: "{{ awx_async_delete_results.results }}"
 
 - name: Find all route tables associated with kOps clusters
   amazon.aws.ec2_vpc_route_table_info:
     filters:
       "tag:Name": "{{ awx_stack.name_prefix }}-public-route-table"
     region: "{{ awx_cluster.aws.region }}"
-  register: route_tables_info
+  register: awx_route_tables_info
 
 - name: Find all subnets associated with route tables' VPCs
   amazon.aws.ec2_vpc_subnet_info:
     filters:
       vpc-id: "{{ item.vpc_id }}"
     region: "{{ awx_cluster.aws.region }}"
-  loop: "{{ route_tables_info.route_tables }}"
-  register: subnet_info_list
+  loop: "{{ awx_route_tables_info.route_tables }}"
+  register: awx_subnet_info_list
 
 - name: Delete all associated subnets
   amazon.aws.ec2_vpc_subnet:
     state: absent
     vpc_id: "{{ item.vpc_id }}"
     region: "{{ awx_cluster.aws.region }}"
     cidr: "{{ item.cidr_block }}"
-  loop: "{{ subnet_info_list.results | sum(attribute='subnets', start=[]) }}"
+  loop: "{{ awx_subnet_info_list.results | sum(attribute='subnets', start=[]) }}"
 
 - name: Delete all associated route tables
   amazon.aws.ec2_vpc_route_table:
@@ -60,18 +60,18 @@
     route_table_id: "{{ item.id }}"
     lookup: id
     state: absent
-  loop: "{{ route_tables_info.route_tables }}"
+  loop: "{{ awx_route_tables_info.route_tables }}"
 
 - name: Delete all associated Internet Gateway
   amazon.aws.ec2_vpc_igw:
     state: absent
     vpc_id: "{{ item }}"
     region: "{{ awx_cluster.aws.region }}"
-  loop: "{{ route_tables_info.route_tables | community.general.json_query('[*].vpc_id') }}"
+  loop: "{{ awx_route_tables_info.route_tables | community.general.json_query('[*].vpc_id') }}"
 
 - name: Delete all associated VPCs
   amazon.aws.ec2_vpc_net:
     state: absent
     vpc_id: "{{ item }}"
     region: "{{ awx_cluster.aws.region }}"
-  loop: "{{ route_tables_info.route_tables | community.general.json_query('[*].vpc_id') }}"
+  loop: "{{ awx_route_tables_info.route_tables | community.general.json_query('[*].vpc_id') }}"

sre/dev/remote_cluster/roles/awx/tasks/main.yaml

@@ -1,16 +1,16 @@
 ---
 - name: Set variables
   ansible.builtin.set_fact:
-    head_cluster_name: "{{ awx_stack.name_prefix }}-head-aws.k8s.local"
-    runner_cluster_names: |
+    awx_head_cluster_name: "{{ awx_stack.name_prefix }}-head-aws.k8s.local"
+    awx_runner_cluster_names: |
       {{
         [awx_stack.name_prefix + "-runner"] |
         product(range(1, awx_stack.runners.count + 1) | map('string')) |
         map('join', '-') |
         zip_longest([], fillvalue="aws.k8s.local") |
         map('join', '-')
       }}
-    state_store: s3://{{ awx_cluster.s3.bucket_name }}
+    awx_kops_state_store: s3://{{ awx_cluster.s3.bucket_name }}
   tags:
     - always
 
@@ -23,34 +23,34 @@
       - --output
       - json
       - --state
-      - "{{ state_store }}"
-  register: clusters_output
+      - "{{ awx_kops_state_store }}"
+  register: awx_clusters_output
   changed_when: false
   ignore_errors: true
   tags:
     - always
 
 - name: Parse cluster names
   ansible.builtin.set_fact:
-    existing_cluster_names: |
+    awx_existing_cluster_names: |
       {{
-        clusters_output.stdout |
+        awx_clusters_output.stdout |
         from_json |
         community.general.json_query('[*].metadata.name')
       }}
   tags:
     - always
   when:
-    - clusters_output.rc == 0
+    - awx_clusters_output.rc == 0
 
 - name: Import asynchronous AWX stack creation tasks
   ansible.builtin.import_tasks:
     file: create_async.yaml
   vars:
-    cluster_names: |
+    awx_cluster_names: |
       {{
-        (runner_cluster_names + [head_cluster_name]) |
-        difference(existing_cluster_names | default([]))
+        (awx_runner_cluster_names + [awx_head_cluster_name]) |
+        difference(awx_existing_cluster_names | default([]))
       }}
   tags:
     - create
@@ -59,19 +59,19 @@
   ansible.builtin.import_tasks:
     file: install_awx.yaml
   vars:
-    cluster_name: "{{ head_cluster_name }}"
+    cluster_name: "{{ awx_head_cluster_name }}"
   tags:
     - create
 
 - name: Import asynchronous AWX stack deletion tasks
   ansible.builtin.import_tasks:
     file: delete_async.yaml
   vars:
-    cluster_names: |
+    awx_cluster_names: |
       {{
-        existing_cluster_names |
+        awx_existing_cluster_names |
         default([]) |
-        intersect((runner_cluster_names + [head_cluster_name]))
+        intersect((awx_runner_cluster_names + [awx_head_cluster_name]))
       }}
   tags:
     - delete