From 3ab6b8890c791450328fe78fadf4074d769ee04e Mon Sep 17 00:00:00 2001
From: Kristian Klausen <kristian@klausen.dk>
Date: Sat, 2 Oct 2021 14:56:29 +0200
Subject: [PATCH] networking: Fix missing and broken hcloud-init conditionals
A string is always "true"[1].
[1] https://stackoverflow.com/a/34868470
---
roles/networking/tasks/main.yml | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/roles/networking/tasks/main.yml b/roles/networking/tasks/main.yml
index d8faf8158..cccf38698 100644
--- a/roles/networking/tasks/main.yml
+++ b/roles/networking/tasks/main.yml
@@ -48,11 +48,15 @@
command: chroot {{ chroot_path }} systemctl enable hcloud-init
register: chroot_systemd_services
changed_when: "chroot_systemd_services.rc == 0"
- when: chroot_path | length != 0 and ("'hcloud' in group_names or inventory_hostname == 'packer-base-image'")
+ when:
+ - chroot_path | length != 0
+ - "'hcloud' in group_names or inventory_hostname == 'packer-base-image'"
- name: start and enable hcloud-init
service: name=hcloud-init daemon_reload=yes state=started enabled=yes
- when: chroot_path | length == 0
+ when:
+ - chroot_path | length == 0
+ - "'hcloud' in group_names or inventory_hostname == 'packer-base-image'"
- name: start and enable networkd
service: name=systemd-networkd state=started enabled=yes
--
GitLab