Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions plugins/module_utils/v2v_wrapper.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ def build_command(self):
"-ip",
"/tmp/passwd",
"-ic",
"esx://{}@{}/Datacenter/{}?no_verify=1".format(
self.params["vcenter_username"],
"vpx://{}@{}/Datacenter/{}?no_verify=1".format(
self.params["vcenter_username"].replace("@", "%40"),
self.params["vcenter_hostname"],
self.params["esxi_hostname"],
),
Expand Down
4 changes: 2 additions & 2 deletions roles/import_workloads/tasks/virt_v2v.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
- name: Find vddk-libdir
ansible.builtin.shell: >
set -o pipefail
find / -name vmware-vix-disklib 2>/dev/null | xargs dirname
find / -path /usr/share/doc -prune -o -name vmware-vix-disklib -print 2>/dev/null | xargs -r dirname | sort -u
args:
executable: /bin/bash
changed_when: false
Expand All @@ -25,7 +25,7 @@
vcenter_username: "{{ vcenter_username }}"
vcenter_hostname: "{{ vcenter_hostname }}"
esxi_hostname: "{{ esxi_hostname }}"
vddk_libdir: "{{ vddk_libdir }}"
vddk_libdir: "{{ vddk_libdir.stdout }}"
vddk_thumbprint: "{{ vddk_thumbprint }}"
conversion_host_id: "{{ conversion_host_id }}"
vm_name: "{{ vm_name }}"
6 changes: 5 additions & 1 deletion tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,11 @@ def build_command(self):
"-ip",
"/tmp/passwd",
"-ic",
f"esx://{self.params['vcenter_username']}@{self.params['vcenter_hostname']}/Datacenter/{self.params['esxi_hostname']}?no_verify=1",
(
f"vpx://{self.params['vcenter_username'].replace('@', '%40')}"
f"@{self.params['vcenter_hostname']}/Datacenter/"
f"{self.params['esxi_hostname']}?no_verify=1"
),
"-it",
"vddk",
"-io",
Expand Down
2 changes: 1 addition & 1 deletion tests/test_v2v_wrapper.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ def test_build_command(self, virt_v2v_instance):
"-ip",
"/tmp/passwd",
"-ic",
f"esx://{vcenter_username}@{vcenter_hostname}/Datacenter/{esxi_hostname}?no_verify=1",
f"vpx://{vcenter_username.replace('@', '%40')}@{vcenter_hostname}/Datacenter/{esxi_hostname}?no_verify=1",
"-it",
"vddk",
"-io",
Expand Down
Loading