diff options
| author | Dan Williams <dcbw@redhat.com> | 2017-07-24 11:15:37 -0500 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2017-07-24 11:17:25 -0500 |
| commit | 04b1c99fd2b769979adf019fe064bc4ba601ef97 (patch) | |
| tree | 639dd8bf7105cf98e093f83a761f9fd17e966ef9 | |
| parent | ba980522331db061b7a342141d227b304caf586e (diff) | |
| download | openshift-04b1c99fd2b769979adf019fe064bc4ba601ef97.tar.gz openshift-04b1c99fd2b769979adf019fe064bc4ba601ef97.tar.bz2 openshift-04b1c99fd2b769979adf019fe064bc4ba601ef97.tar.xz openshift-04b1c99fd2b769979adf019fe064bc4ba601ef97.zip | |
libvirt: fall back to mkisofs if genisoimage isn't available
| -rw-r--r-- | README_libvirt.md | 2 | ||||
| -rw-r--r-- | playbooks/libvirt/openshift-cluster/tasks/launch_instances.yml | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/README_libvirt.md b/README_libvirt.md index b8a24d705..1661681a0 100644 --- a/README_libvirt.md +++ b/README_libvirt.md @@ -15,7 +15,7 @@ Install dependencies 3. Install [ebtables](http://ebtables.netfilter.org/) 4. Install [qemu and qemu-system-x86](http://wiki.qemu.org/Main_Page) 5. Install [libvirt-python and libvirt](http://libvirt.org/) -6. Install [genisoimage](http://cdrkit.org/) +6. Install [genisoimage](http://cdrkit.org/) or [mkisofs](http://cdrtools.sourceforge.net/private/cdrecord.html) 7. Enable and start the libvirt daemon, e.g: - `systemctl enable libvirtd` - `systemctl start libvirtd` diff --git a/playbooks/libvirt/openshift-cluster/tasks/launch_instances.yml b/playbooks/libvirt/openshift-cluster/tasks/launch_instances.yml index ccd29be29..f445206ef 100644 --- a/playbooks/libvirt/openshift-cluster/tasks/launch_instances.yml +++ b/playbooks/libvirt/openshift-cluster/tasks/launch_instances.yml @@ -49,8 +49,12 @@ - '{{ instances }}' - [ user-data, meta-data ] +- name: Check for genisoimage + command: which genisoimage + register: which_genisoimage + - name: Create the cloud-init config drive - command: 'genisoimage -output {{ libvirt_storage_pool_path }}/{{ item }}_cloud-init.iso -volid cidata -joliet -rock user-data meta-data' + command: '{{ 'genisoimage' if which_genisoimage.rc == 0 else 'mkisofs'}} -output {{ libvirt_storage_pool_path }}/{{ item }}_cloud-init.iso -volid cidata -joliet -rock user-data meta-data' args: chdir: '{{ libvirt_storage_pool_path }}/{{ item }}_configdrive/' creates: '{{ libvirt_storage_pool_path }}/{{ item }}_cloud-init.iso' |