From 24d3cf087651aa79da27441144e631376b663333 Mon Sep 17 00:00:00 2001 From: Adam Grare Date: Thu, 19 Mar 2020 13:51:04 -0400 Subject: [PATCH] Merge pull request #19980 from fdupont-redhat/v2v_bz_1815046 Do not mount VDDK folder if transport method is SSH (cherry picked from commit bca006442018c7f755807e11495dd417adf413e6) https://bugzilla.redhat.com/show_bug.cgi?id=1815046 --- app/models/conversion_host.rb | 2 +- spec/models/conversion_host_spec.rb | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/app/models/conversion_host.rb b/app/models/conversion_host.rb index 100eb4d77bc..4239b83730e 100644 --- a/app/models/conversion_host.rb +++ b/app/models/conversion_host.rb @@ -246,8 +246,8 @@ def build_podman_command(task_id, conversion_options) [:volume, "/var/tmp:/var/tmp"], [:volume, "/var/lib/uci/#{task_id}:/var/lib/uci"], [:volume, "/var/log/uci/#{task_id}:/var/log/uci"], - [:volume, "/opt/vmware-vix-disklib-distrib:/opt/vmware-vix-disklib-distrib"] ] + params << [:volume, "/opt/vmware-vix-disklib-distrib:/opt/vmware-vix-disklib-distrib"] unless conversion_options[:transport_method] == 'ssh' params << [:volume, "/root/.ssh/id_rsa:/var/lib/uci/ssh_private_key"] if conversion_options[:transport_method] == 'ssh' params << [:volume, "/root/.v2v_luks_keys_vault.json:/var/lib/uci/luks_keys_vault.json"] if luks_keys_vault_valid? params << uci_image diff --git a/spec/models/conversion_host_spec.rb b/spec/models/conversion_host_spec.rb index 8bfbf8fb8b6..9dd67ebbf6b 100644 --- a/spec/models/conversion_host_spec.rb +++ b/spec/models/conversion_host_spec.rb @@ -566,7 +566,6 @@ " --volume /var/tmp:/var/tmp"\ " --volume /var/lib/uci/#{task.id}:/var/lib/uci"\ " --volume /var/log/uci/#{task.id}:/var/log/uci"\ - " --volume /opt/vmware-vix-disklib-distrib:/opt/vmware-vix-disklib-distrib"\ " --volume /root/.ssh/id_rsa:/var/lib/uci/ssh_private_key"\ " --volume /root/.v2v_luks_keys_vault.json:/var/lib/uci/luks_keys_vault.json"\ " manageiq/v2v-conversion-host:latest"