From 730c00fa94611036fd15ff872c4ab040c5aad841 Mon Sep 17 00:00:00 2001 From: Harry Rybacki Date: Tue, 13 Jun 2017 15:36:35 -0400 Subject: [PATCH] Give `supplemental_node` default value `supplemental_node` will not always be defined for a given OOOQ invocation. Nested conditionals within blocks do not behave properly so we have to allow for graceful failures. Adding a default, empty, string here will prevent Ansible from hard failing on an undefined variable. Change-Id: I8bcdc5793bf2d25e8dd11f4684c642b74b2b2798 --- roles/libvirt/teardown/nodes/tasks/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/libvirt/teardown/nodes/tasks/main.yml b/roles/libvirt/teardown/nodes/tasks/main.yml index e6b28a0d9..8db594770 100644 --- a/roles/libvirt/teardown/nodes/tasks/main.yml +++ b/roles/libvirt/teardown/nodes/tasks/main.yml @@ -61,19 +61,19 @@ block: - name: Check undercloud vm command: > - virsh domid "{{ supplemental_node }}" + virsh domid "{{ supplemental_node.name|default('') }}" ignore_errors: true register: supplemental_check - name: Destroy supplemental vm command: > - virsh destroy "{{ supplemental_node.name }}" + virsh destroy "{{ supplemental_node.name|default('') }}" when: supplemental_check|success ignore_errors: true - name: Undefine supplemental vm command: > - virsh undefine "{{ supplemental_node.name }}" --remove-all-storage + virsh undefine "{{ supplemental_node.name|default('') }}" --remove-all-storage when: supplemental_check|success ignore_errors: true