From aa3c7f18aaa0780af426810e6258bfc92d2000c6 Mon Sep 17 00:00:00 2001 From: stephane Date: Wed, 6 Jan 2016 14:14:05 -0800 Subject: [PATCH] Modify detection of iso_gen_utility On some platforms, mkisofs is a symlink to genisoimage. Currently, the playbook will see this as mkisofs existing on the system, so the playbook's output will look wrong even though the correct tool is getting used. Make the output clearer by enhancing the check to set the iso_gen_utility fact. Change-Id: If2c3e22c90ea30e66bd6c32e748de66548ff5d0d --- playbooks/roles/bifrost-configdrives-dynamic/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/playbooks/roles/bifrost-configdrives-dynamic/tasks/main.yml b/playbooks/roles/bifrost-configdrives-dynamic/tasks/main.yml index f7f76c676..ebde6a5cb 100644 --- a/playbooks/roles/bifrost-configdrives-dynamic/tasks/main.yml +++ b/playbooks/roles/bifrost-configdrives-dynamic/tasks/main.yml @@ -69,7 +69,7 @@ - name: "If mkisofs is not available, fallback to genisoimage" set_fact: iso_gen_utility: "genisoimage" - when: test_mkisofs.rc != 0 + when: ('genisoimage' in test_mkisofs.stderr) or test_mkisofs.rc != 0 - name: "Check if genisoimage is available" shell: genisoimage --help >>/dev/null ignore_errors: yes