From 84561cfcc8c061d223d17706cc5a7bbc5d9b6692 Mon Sep 17 00:00:00 2001 From: dfisiuk-clgx Date: Mon, 30 Sep 2024 21:50:47 +0200 Subject: [PATCH 1/2] added support for additional disks for gce --- .../playbooks/tasks/create_linux_instance.yml | 17 +++++++++-------- .../playbooks/tasks/create_windows_instance.yml | 17 +++++++++-------- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/src/molecule_plugins/gce/playbooks/tasks/create_linux_instance.yml b/src/molecule_plugins/gce/playbooks/tasks/create_linux_instance.yml index 8f25b0b0..2f3dd6ce 100644 --- a/src/molecule_plugins/gce/playbooks/tasks/create_linux_instance.yml +++ b/src/molecule_plugins/gce/playbooks/tasks/create_linux_instance.yml @@ -5,6 +5,14 @@ path: "{{ ssh_identity_file }}" register: keypair +- name: Set default boot disk + ansible.builtin.set_fact: + disks: + - auto_delete: true + boot: true + initialize_params: + source_image: "projects/debian-cloud/global/images/family/debian-10" + - name: "Create molecule Linux instance(s)" google.cloud.gcp_compute_instance: state: present @@ -14,14 +22,7 @@ ssh-keys: "{{ lookup('env', 'USER') }}:{{ keypair.public_key }}" scheduling: preemptible: "{{ item.preemptible | default(false) }}" - disks: - - auto_delete: true - boot: true - initialize_params: - disk_size_gb: "{{ item.disk_size_gb | default(omit) }}" - source_image: "{{ item.image | default('projects/debian-cloud/global/images/family/debian-10') }}" - source_image_encryption_key: - raw_key: "{{ item.image_encryption_key | default(omit) }}" + disks: "{{ item.disks | default(disks,true) }}" network_interfaces: - network: selfLink: "{{ gcp_net }}" diff --git a/src/molecule_plugins/gce/playbooks/tasks/create_windows_instance.yml b/src/molecule_plugins/gce/playbooks/tasks/create_windows_instance.yml index 57ba741f..ea9bd057 100644 --- a/src/molecule_plugins/gce/playbooks/tasks/create_windows_instance.yml +++ b/src/molecule_plugins/gce/playbooks/tasks/create_windows_instance.yml @@ -1,4 +1,12 @@ --- +- name: Set default boot disk + ansible.builtin.set_fact: + disks: + - auto_delete: true + boot: true + initialize_params: + source_image: "projects/windows-cloud/global/images/family/windows-2019" + - name: Create molecule Windows instance(s) google.cloud.gcp_compute_instance: state: present @@ -6,14 +14,7 @@ machine_type: "{{ item.machine_type | default('n1-standard-1') }}" scheduling: preemptible: "{{ item.preemptible | default(false) }}" - disks: - - auto_delete: true - boot: true - initialize_params: - disk_size_gb: "{{ item.disk_size_gb | default(omit) }}" - source_image: "{{ item.image | default('projects/windows-cloud/global/images/family/windows-2019') }}" - source_image_encryption_key: - raw_key: "{{ item.image_encryption_key | default(omit) }}" + disks: "{{ item.disks | default(disks,true) }}" network_interfaces: - network: selfLink: "{{ gcp_net }}" From d4f334cef325a9c129e2884d540ad24b0c249648 Mon Sep 17 00:00:00 2001 From: Dzianis Fisiuk Date: Wed, 2 Oct 2024 19:26:31 +0000 Subject: [PATCH 2/2] GCE cleanup unused code --- .../gce/playbooks/tasks/create_linux_instance.yml | 10 +--------- .../gce/playbooks/tasks/create_windows_instance.yml | 10 +--------- 2 files changed, 2 insertions(+), 18 deletions(-) diff --git a/src/molecule_plugins/gce/playbooks/tasks/create_linux_instance.yml b/src/molecule_plugins/gce/playbooks/tasks/create_linux_instance.yml index 2f3dd6ce..4f5b0915 100644 --- a/src/molecule_plugins/gce/playbooks/tasks/create_linux_instance.yml +++ b/src/molecule_plugins/gce/playbooks/tasks/create_linux_instance.yml @@ -5,14 +5,6 @@ path: "{{ ssh_identity_file }}" register: keypair -- name: Set default boot disk - ansible.builtin.set_fact: - disks: - - auto_delete: true - boot: true - initialize_params: - source_image: "projects/debian-cloud/global/images/family/debian-10" - - name: "Create molecule Linux instance(s)" google.cloud.gcp_compute_instance: state: present @@ -22,7 +14,7 @@ ssh-keys: "{{ lookup('env', 'USER') }}:{{ keypair.public_key }}" scheduling: preemptible: "{{ item.preemptible | default(false) }}" - disks: "{{ item.disks | default(disks,true) }}" + disks: "{{ item.disks }}" network_interfaces: - network: selfLink: "{{ gcp_net }}" diff --git a/src/molecule_plugins/gce/playbooks/tasks/create_windows_instance.yml b/src/molecule_plugins/gce/playbooks/tasks/create_windows_instance.yml index ea9bd057..f1928280 100644 --- a/src/molecule_plugins/gce/playbooks/tasks/create_windows_instance.yml +++ b/src/molecule_plugins/gce/playbooks/tasks/create_windows_instance.yml @@ -1,12 +1,4 @@ --- -- name: Set default boot disk - ansible.builtin.set_fact: - disks: - - auto_delete: true - boot: true - initialize_params: - source_image: "projects/windows-cloud/global/images/family/windows-2019" - - name: Create molecule Windows instance(s) google.cloud.gcp_compute_instance: state: present @@ -14,7 +6,7 @@ machine_type: "{{ item.machine_type | default('n1-standard-1') }}" scheduling: preemptible: "{{ item.preemptible | default(false) }}" - disks: "{{ item.disks | default(disks,true) }}" + disks: "{{ item.disks }}" network_interfaces: - network: selfLink: "{{ gcp_net }}"