From 9e27d9707bd896321f1b6850bed052e2a7c409a8 Mon Sep 17 00:00:00 2001 From: Jeremy Lecour Date: Thu, 3 Feb 2022 14:16:09 +0100 Subject: [PATCH] kvm-host: add missing default value --- CHANGELOG.md | 1 + kvm-host/defaults/main.yml | 4 +++- kvm-host/tasks/ssh.yml | 12 ++++++++++-- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e03b8306..a28e9801 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ The **patch** part changes is incremented if multiple releases happen the same m ### Added * evolinux-base: option to bypass raid-related tasks +* kvm-host: add missing default value ### Changed diff --git a/kvm-host/defaults/main.yml b/kvm-host/defaults/main.yml index bec20a12..574c249f 100644 --- a/kvm-host/defaults/main.yml +++ b/kvm-host/defaults/main.yml @@ -1,4 +1,6 @@ --- kvm_custom_libvirt_images_path: '' kvm_install_drbd: True -kvm_scripts_dir: /usr/local/sbin \ No newline at end of file +kvm_scripts_dir: /usr/local/sbin + +kvm_pair: null \ No newline at end of file diff --git a/kvm-host/tasks/ssh.yml b/kvm-host/tasks/ssh.yml index a36f7549..54f69652 100644 --- a/kvm-host/tasks/ssh.yml +++ b/kvm-host/tasks/ssh.yml @@ -34,7 +34,11 @@ special_time: "hourly" user: root job: "rsync -a --delete /etc/libvirt/qemu/*xml {{ hostvars[kvm_pair]['lan.ip'] }}:/root/libvirt-{{ inventory_hostname }}/" - when: kvm_pair != inventory_hostname + when: + - kvm_pair is defined + - kvm_pair is not none + - kvm_pair | length > 0 + - kvm_pair != inventory_hostname tags: crontab - name: Crontab for sync list of running vm @@ -44,5 +48,9 @@ special_time: "daily" user: root job: "virsh list --all | tee /root/virsh-list.txt | ssh {{ hostvars[kvm_pair]['lan.ip'] }} 'cat >/root/libvirt-{{ inventory_hostname }}/virsh-list.txt'" - when: kvm_pair != inventory_hostname + when: + - kvm_pair is defined + - kvm_pair is not none + - kvm_pair | length > 0 + - kvm_pair != inventory_hostname tags: crontab