Skip to content

Commit

Permalink
fixup! Fix ansible linting issues
Browse files Browse the repository at this point in the history
  • Loading branch information
nocturnalastro committed Mar 25, 2024
1 parent a33366c commit 87a8267
Show file tree
Hide file tree
Showing 3 changed files with 38 additions and 19 deletions.
9 changes: 6 additions & 3 deletions deploy_cluster.yml
Original file line number Diff line number Diff line change
@@ -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)
21 changes: 14 additions & 7 deletions deploy_day2_workers.yml
Original file line number Diff line number Diff line change
@@ -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([]) }}"
Expand All @@ -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
27 changes: 18 additions & 9 deletions deploy_prerequisites.yml
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 87a8267

Please sign in to comment.