diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-07-24 19:08:29 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-24 19:08:29 -0400 |
| commit | d3af493cb3e67c1877dac8cf92e4cad256fe452b (patch) | |
| tree | 8c040d0976b5b903a3812deff18ea29cfc67a8d3 /playbooks/libvirt | |
| parent | e35719849e536dc32602d34d3518e53f38570a51 (diff) | |
| parent | 04b1c99fd2b769979adf019fe064bc4ba601ef97 (diff) | |
| download | openshift-d3af493cb3e67c1877dac8cf92e4cad256fe452b.tar.gz openshift-d3af493cb3e67c1877dac8cf92e4cad256fe452b.tar.bz2 openshift-d3af493cb3e67c1877dac8cf92e4cad256fe452b.tar.xz openshift-d3af493cb3e67c1877dac8cf92e4cad256fe452b.zip | |
Merge pull request #4846 from dcbw/libvirt-fixups
libvirt fixups
Diffstat (limited to 'playbooks/libvirt')
| -rw-r--r-- | playbooks/libvirt/openshift-cluster/tasks/launch_instances.yml | 6 |
1 files changed, 5 insertions, 1 deletions
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' |