From 87a8267e1ecd0cddbfda0fdddbf44c7448089c66 Mon Sep 17 00:00:00 2001
From: Michele Costa <micosta@redhat.com>
Date: Mon, 25 Mar 2024 14:02:38 +0000
Subject: [PATCH] fixup! Fix ansible linting issues

---
 deploy_cluster.yml       |  9 ++++++---
 deploy_day2_workers.yml  | 21 ++++++++++++++-------
 deploy_prerequisites.yml | 27 ++++++++++++++++++---------
 3 files changed, 38 insertions(+), 19 deletions(-)

diff --git a/deploy_cluster.yml b/deploy_cluster.yml
index 7d140666..d82cc48f 100644
--- a/deploy_cluster.yml
+++ b/deploy_cluster.yml
@@ -1,8 +1,11 @@
 ---
-- import_playbook: playbooks/validate_inventory.yml
+- name: Validate Inventory
+  ansible.builtin.import_playbook: playbooks/validate_inventory.yml
 
-- import_playbook: playbooks/deploy_cluster_agent_based_installer.yml
+- name: Deploy cluster using agent based installer
+  ansible.builtin.import_playbook: playbooks/deploy_cluster_agent_based_installer.yml
   when: (use_agent_based_installer | default(true)) | bool
 
-- import_playbook: playbooks/deploy_cluster_assisted_installer.yml
+- name: Deploy cluster using agent based installer
+  ansible.builtin.import_playbook: playbooks/deploy_cluster_assisted_installer.yml
   when: not ((use_agent_based_installer | default(true)) | bool)
diff --git a/deploy_day2_workers.yml b/deploy_day2_workers.yml
index c68e7849..38d42ee3 100644
--- a/deploy_day2_workers.yml
+++ b/deploy_day2_workers.yml
@@ -1,7 +1,9 @@
 ---
-- import_playbook: playbooks/validate_inventory.yml
+- name: Validate inventory
+  ansible.builtin.import_playbook: playbooks/validate_inventory.yml
 
-- import_playbook: playbooks/create_vms.yml
+- name: Create VMs
+  import_playbook: playbooks/create_vms.yml
   when: groups['day2_workers'] | default([]) | length > 0
   vars:
     nodes_to_process: "{{ groups['day2_workers'] | default([]) }}"
@@ -11,21 +13,26 @@
     # are trying to join
     DELETE_VM_BRIDGE: false
 
-- import_playbook: playbooks/create_day2_cluster.yml
+- name: Create Day 2 cluster instance
+  ansible.builtin.import_playbook: playbooks/create_day2_cluster.yml
 
-- import_playbook: playbooks/generate_discovery_iso.yml
+- name: Generate Day 2 discovery iso
+  ansible.builtin.import_playbook: playbooks/generate_discovery_iso.yml
   when: groups['day2_workers'] | default([]) | length > 0
   vars:
     discovery_iso_name: "{{ day2_discovery_iso_name }}"
     iso_cluster_id: "{{ add_host_cluster_id }}"
 
-- import_playbook: playbooks/boot_iso.yml
+- name: Boot Day 2 ISO
+  import_playbook: playbooks/boot_iso.yml
   when: groups['day2_workers'] | default([]) | length > 0
   vars:
     discovery_iso_name: "{{ day2_discovery_iso_name }}"
     boot_iso_url: "{{ discovery_iso_server }}/{{ day2_discovery_iso_name }}"
     boot_iso_hosts: day2_workers
 
-- import_playbook: playbooks/add_day2_nodes.yml
+- name: Add day 2 nodes to cluster
+  ansible.builtin.import_playbook: playbooks/add_day2_nodes.yml
 
-- import_playbook: playbooks/approve_csrs.yml
+- name: Approve node CSRs
+  ansible.builtin.import_playbook: playbooks/approve_csrs.yml
diff --git a/deploy_prerequisites.yml b/deploy_prerequisites.yml
index 55d27936..ad9d5129 100644
--- a/deploy_prerequisites.yml
+++ b/deploy_prerequisites.yml
@@ -1,26 +1,35 @@
 ---
-- import_playbook: prereq_facts_check.yml
+- name: Prereq fact checks
+  ansible.builtin.import_playbook: prereq_facts_check.yml
 
 - name: Play to populate image_hashes for relevant images
   hosts: localhost
   roles:
     - redhatci.ocp.get_image_hash
 
-- import_playbook: playbooks/deploy_ntp.yml
+- name: Deploy NTP
+  ansible.builtin.import_playbook: playbooks/deploy_ntp.yml
 
-- import_playbook: playbooks/deploy_http_store.yml
+- name: Deploy HTTP Store
+  ansible.builtin.import_playbook: playbooks/deploy_http_store.yml
 
-- import_playbook: playbooks/create_vms.yml
+- name: Create VMs
+  ansible.builtin.import_playbook: playbooks/create_vms.yml
   vars:
     nodes_to_process: "{{ groups['masters'] + groups['workers'] | default([]) }}"
 
-- import_playbook: playbooks/deploy_tftp.yml
+- name: Deploy TFTP
+  ansible.builtin.import_playbook: playbooks/deploy_tftp.yml
 
-- import_playbook: playbooks/deploy_dns.yml
+- name: Deploy DNS
+  ansible.builtin.import_playbook: playbooks/deploy_dns.yml
 
-- import_playbook: playbooks/deploy_registry.yml
+- name: Deploy Registry
+  ansible.builtin.import_playbook: playbooks/deploy_registry.yml
 
-- import_playbook: playbooks/deploy_assisted_installer_onprem.yml
+- name: Deploy assisted installer on prem
+  ansible.builtin.import_playbook: playbooks/deploy_assisted_installer_onprem.yml
   when: not ((use_agent_based_installer | default(true)) | bool)
 
-- import_playbook: playbooks/deploy_sushy_tools.yml
+- name: Deploy Sushy Tools
+  ansible.builtin.import_playbook: playbooks/deploy_sushy_tools.yml