Merge #81

81: terraform/nixos-rebuild: do not ignore deploy errors by default r=jfroche a=jfroche



Co-authored-by: Jean-François Roche <jfroche@pyxel.be>

Author: bors[bot]

terraform/nixos-rebuild/deploy.sh

@@ -2,15 +2,16 @@
 
 set -uex -o pipefail
 
-if [ "$#" -ne 4 ]; then
-  echo "USAGE: $0 NIXOS_SYSTEM TARGET_USER TARGET_HOST TARGET_PORT" >&2
+if [ "$#" -ne 5 ]; then
+  echo "USAGE: $0 NIXOS_SYSTEM TARGET_USER TARGET_HOST TARGET_PORT IGNORE_SYSTEMD_ERRORS" >&2
   exit 1
 fi
 
 NIXOS_SYSTEM=$1
 TARGET_USER=$2
 TARGET_HOST=$3
 TARGET_PORT=$4
+IGNORE_SYSTEMD_ERRORS=$5
 shift 3
 
 TARGET="${TARGET_USER}@${TARGET_HOST}"
@@ -47,5 +48,10 @@ switchCommand="nix-env -p /nix/var/nix/profiles/system --set $(printf "%q" "$NIX
 if [[ $TARGET_USER != "root" ]]; then
   switchCommand="sudo bash -c '$switchCommand'"
 fi
+deploy_status=0
 # shellcheck disable=SC2029
-ssh "${sshOpts[@]}" "$TARGET" "$switchCommand"
+ssh "${sshOpts[@]}" "$TARGET" "$switchCommand" || deploy_status="$?"
+if [[ $IGNORE_SYSTEMD_ERRORS == "true" && $deploy_status == "4" ]]; then
+  exit 0
+fi
+exit "$deploy_status"

terraform/nixos-rebuild/main.tf

@@ -6,7 +6,6 @@ resource "null_resource" "nixos-rebuild" {
     environment = {
       SSH_KEY = var.ssh_private_key
     }
-
-    command = "${path.module}/deploy.sh ${var.nixos_system} ${var.target_user} ${var.target_host} ${var.target_port}"
+    command = "${path.module}/deploy.sh ${var.nixos_system} ${var.target_user} ${var.target_host} ${var.target_port} ${var.ignore_systemd_errors}"
   }
 }

terraform/nixos-rebuild/variables.tf

@@ -25,3 +25,9 @@ variable "ssh_private_key" {
   description = "Content of private key used to connect to the target_host. If set to - no key is passed to openssh and ssh will back to its own configuration"
   default     = "-"
 }
+
+variable "ignore_systemd_errors" {
+  type = bool
+  description = "Ignore systemd errors happening during deploy"
+  default = false
+}