terraform: add no-reboot option

nix-community · Sep 3, 2023 · 414aa45 · 414aa45
1 parent 1cf3fd1
commit 414aa45
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 1 deletion.
diff --git a/terraform/all-in-one/main.tf b/terraform/all-in-one/main.tf
@@ -29,6 +29,7 @@ module "install" {
   disk_encryption_key_scripts  = var.disk_encryption_key_scripts
   extra_environment            = var.extra_environment
   instance_id                  = var.instance_id
+  no_reboot                    = var.no_reboot
 }
 
 module "nixos-rebuild" {

diff --git a/terraform/all-in-one/variables.tf b/terraform/all-in-one/variables.tf
@@ -95,3 +95,9 @@ variable "extra_environment" {
   description = "Extra environment variables to be set during installation. This can be usefull to set extra variables for the extra_files_script or disk_encryption_key_scripts"
   default     = {}
 }
+
+variable "no_reboot" {
+  type        = bool
+  description = "Do not reboot after installation"
+  default     = false
+}
diff --git a/terraform/install/main.tf b/terraform/install/main.tf
@@ -17,6 +17,7 @@ resource "null_resource" "nixos-remote" {
       target_user = var.target_user
       target_host = var.target_host
       extra_files_script = var.extra_files_script
+      no_reboot = var.no_reboot
     }, var.extra_environment)
     command = "${path.module}/run-nixos-anywhere.sh ${join(" ", local.disk_encryption_key_scripts)}"
     quiet   = var.debug_logging

diff --git a/terraform/install/run-nixos-anywhere.sh b/terraform/install/run-nixos-anywhere.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-set -euo pipefail
+set -euo pipefail -x
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" &>/dev/null && pwd)"
 args=()
@@ -13,6 +13,9 @@ fi
 if [[ ${kexec_tarball_url-} != "" ]]; then
   args+=("--kexec" "${kexec_tarball_url}")
 fi
+if [[ ${no_reboot-} == "true" ]]; then
+  args+=("--no-reboot")
+fi
 args+=("--store-paths" "${nixos_partitioner}" "${nixos_system}")
 
 tmpdir=$(mktemp -d)
@@ -51,6 +54,7 @@ while [[ $# -gt 0 ]]; do
   fi
   mkdir "${tmpdir}/keys"
   "$2" >"${tmpdir}/keys/$keyIdx"
+  cat "${tmpdir}/keys/$keyIdx"
   args+=("--disk-encryption-keys" "$1" "$2")
   shift
   shift

diff --git a/terraform/install/variables.tf b/terraform/install/variables.tf
@@ -77,3 +77,9 @@ variable "extra_environment" {
   description = "Extra environment variables to be set during installation. This can be usefull to set extra variables for the extra_files_script or disk_encryption_key_scripts"
   default     = {}
 }
+
+variable "no_reboot" {
+  type        = bool
+  description = "Do not reboot the machine after installation"
+  default     = false
+}