From 67ccb543b43beb03318babdd40b31e52a27776f3 Mon Sep 17 00:00:00 2001 From: Dzianis Fisiuk Date: Mon, 7 Oct 2024 18:28:41 +0000 Subject: [PATCH 1/3] GCE: added support of startup-script --- .../gce/playbooks/tasks/create_linux_instance.yml | 1 + .../gce/playbooks/tasks/create_windows_instance.yml | 2 ++ 2 files changed, 3 insertions(+) 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 1564397e..32320611 100644 --- a/src/molecule_plugins/gce/playbooks/tasks/create_linux_instance.yml +++ b/src/molecule_plugins/gce/playbooks/tasks/create_linux_instance.yml @@ -12,6 +12,7 @@ machine_type: "{{ item.machine_type | default('n1-standard-1') }}" metadata: ssh-keys: "{{ lookup('env', 'USER') }}:{{ keypair.public_key }}" + startup-script: "{{ lookup('file', item.startup_script_path) | default(omit, true) }}" scheduling: preemptible: "{{ item.preemptible | default(false) }}" disks: 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 e8284095..f8984ad9 100644 --- a/src/molecule_plugins/gce/playbooks/tasks/create_windows_instance.yml +++ b/src/molecule_plugins/gce/playbooks/tasks/create_windows_instance.yml @@ -4,6 +4,8 @@ state: present name: "{{ item.name }}" machine_type: "{{ item.machine_type | default('n1-standard-1') }}" + metatdata: + startup-script: "{{ lookup('file', item.startup_script_path) | default(omit, true) }}" scheduling: preemptible: "{{ item.preemptible | default(false) }}" disks: From 6366e20ddd54588b3f085d435bb28af231f0a804 Mon Sep 17 00:00:00 2001 From: Dzianis Fisiuk Date: Tue, 8 Oct 2024 17:05:49 +0000 Subject: [PATCH 2/3] GCE: added metadata startup-script support --- .../gce/playbooks/tasks/create_linux_instance.yml | 2 +- .../gce/playbooks/tasks/create_windows_instance.yml | 2 +- 2 files changed, 2 insertions(+), 2 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 32320611..30bad2b9 100644 --- a/src/molecule_plugins/gce/playbooks/tasks/create_linux_instance.yml +++ b/src/molecule_plugins/gce/playbooks/tasks/create_linux_instance.yml @@ -12,7 +12,7 @@ machine_type: "{{ item.machine_type | default('n1-standard-1') }}" metadata: ssh-keys: "{{ lookup('env', 'USER') }}:{{ keypair.public_key }}" - startup-script: "{{ lookup('file', item.startup_script_path) | default(omit, true) }}" + startup-script: "{{ lookup('file', item.startup_script_path) if (item.startup_script_path is defined and item.startup_script_path | length > 0) else omit }}" scheduling: preemptible: "{{ item.preemptible | default(false) }}" disks: 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 f8984ad9..e0035773 100644 --- a/src/molecule_plugins/gce/playbooks/tasks/create_windows_instance.yml +++ b/src/molecule_plugins/gce/playbooks/tasks/create_windows_instance.yml @@ -5,7 +5,7 @@ name: "{{ item.name }}" machine_type: "{{ item.machine_type | default('n1-standard-1') }}" metatdata: - startup-script: "{{ lookup('file', item.startup_script_path) | default(omit, true) }}" + startup-script: "{{ lookup('file', item.startup_script_path) if (item.startup_script_path is defined and item.startup_script_path | length > 0) else omit }}" scheduling: preemptible: "{{ item.preemptible | default(false) }}" disks: From 4530a0cce5106c68ff12b4cee27e5384931f117e Mon Sep 17 00:00:00 2001 From: Dzianis Fisiuk Date: Tue, 8 Oct 2024 17:32:24 +0000 Subject: [PATCH 3/3] removed startup-script for windows, it is used other metadata keys --- .../gce/playbooks/tasks/create_windows_instance.yml | 2 -- 1 file changed, 2 deletions(-) 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 e0035773..e8284095 100644 --- a/src/molecule_plugins/gce/playbooks/tasks/create_windows_instance.yml +++ b/src/molecule_plugins/gce/playbooks/tasks/create_windows_instance.yml @@ -4,8 +4,6 @@ state: present name: "{{ item.name }}" machine_type: "{{ item.machine_type | default('n1-standard-1') }}" - metatdata: - startup-script: "{{ lookup('file', item.startup_script_path) if (item.startup_script_path is defined and item.startup_script_path | length > 0) else omit }}" scheduling: preemptible: "{{ item.preemptible | default(false) }}" disks: