From 065c626852872afd5ecdbb0851a1d7793d689b45 Mon Sep 17 00:00:00 2001 From: sousinha1997 Date: Tue, 11 Feb 2025 18:23:52 +0530 Subject: [PATCH 1/2] Add missing task - Create disk --- ansible_roles/roles/gcp_create_instance/tasks/disks.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ansible_roles/roles/gcp_create_instance/tasks/disks.yml b/ansible_roles/roles/gcp_create_instance/tasks/disks.yml index f3db66e..54b0bf4 100644 --- a/ansible_roles/roles/gcp_create_instance/tasks/disks.yml +++ b/ansible_roles/roles/gcp_create_instance/tasks/disks.yml @@ -20,4 +20,10 @@ dest: "{{working_dir}}/tf/env.tfvars" block: "{{ lookup('template', 'tfvars_disks.j2') }}" +- name: GCP, create disks + include_role: + name: tf_create + vars: + tf_var_file: "env.tfvars" + From d8e9d56d2ff11e89782591f4e80aee07e4d379cb Mon Sep 17 00:00:00 2001 From: sousinha1997 Date: Tue, 18 Feb 2025 17:04:33 +0530 Subject: [PATCH 2/2] Shifts the task to correct location --- .../roles/gcp_create_instance/tasks/disks.yml | 5 ----- .../roles/gcp_create_instance/tasks/main.yml | 18 +++++++++--------- 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/ansible_roles/roles/gcp_create_instance/tasks/disks.yml b/ansible_roles/roles/gcp_create_instance/tasks/disks.yml index 54b0bf4..5b4960a 100644 --- a/ansible_roles/roles/gcp_create_instance/tasks/disks.yml +++ b/ansible_roles/roles/gcp_create_instance/tasks/disks.yml @@ -20,10 +20,5 @@ dest: "{{working_dir}}/tf/env.tfvars" block: "{{ lookup('template', 'tfvars_disks.j2') }}" -- name: GCP, create disks - include_role: - name: tf_create - vars: - tf_var_file: "env.tfvars" diff --git a/ansible_roles/roles/gcp_create_instance/tasks/main.yml b/ansible_roles/roles/gcp_create_instance/tasks/main.yml index 2d272b6..6a50c0a 100644 --- a/ansible_roles/roles/gcp_create_instance/tasks/main.yml +++ b/ansible_roles/roles/gcp_create_instance/tasks/main.yml @@ -44,6 +44,15 @@ # - name: terraform apply tasks # include_tasks: tf_apply.yml +- name: Create and attach disks to instance + include_tasks: disks.yml + vars: + disk_params: "{{ disks }}" + loop: "{{ config_info.cloud_disks }}" + loop_control: + loop_var: disks + when: config_info.cloud_disks is defined + - name: GCP, create instance include_role: name: tf_create @@ -92,7 +101,6 @@ - ssh_net_copy when: config_info.cloud_numb_networks|int >= 1 - - name: Create root .ssh directory delegate_to: "{{ item }}" become: yes @@ -130,11 +138,3 @@ - name: Add host to test and install groups include_tasks: add_host_to_groups.yml -- name: Create and attach disks to instance - include_tasks: disks.yml - vars: - disk_params: "{{ disks }}" - loop: "{{ config_info.cloud_disks }}" - loop_control: - loop_var: disks - when: config_info.cloud_disks is defined