Merge pull request #1886 from su-mangale/fix-nutanix-ansible-scp-args

k8s-ci-robot · web-flow · commit e1b4516e00ca · 2025-11-19T02:36:03.000-08:00
nutanix: pass ansible scp extra args to provisioner
diff --git a/images/capi/packer/nutanix/packer-windows.json b/images/capi/packer/nutanix/packer-windows.json
@@ -161,7 +161,7 @@
     "nutanix_port": "{{env `NUTANIX_PORT`}}",
     "nutanix_subnet_name": "{{env `NUTANIX_SUBNET_NAME`}}",
     "nutanix_username": "{{env `NUTANIX_USERNAME`}}",
-    "scp_extra_vars": "",
+    "scp_extra_vars": "{{user `ansible_scp_extra_args`}}",
     "vm_force_delete": "false",
     "windows_admin_password": "{{env `WINDOWS_ADMIN_PASSWORD`}}"
   }
diff --git a/images/capi/packer/nutanix/packer.json.tmpl b/images/capi/packer/nutanix/packer.json.tmpl
@@ -155,7 +155,7 @@
     "nutanix_subnet_name": "{{env `NUTANIX_SUBNET_NAME`}}",
     "nutanix_username": "{{env `NUTANIX_USERNAME`}}",
     "python_path": "",
-    "scp_extra_vars": "",
+    "scp_extra_vars": "{{user `ansible_scp_extra_args`}}",
     "source_image_delete": "false",
     "source_image_force": "false",
     "ssh_password": "$SSH_PASSWORD",

Original file line number	Diff line number	Diff line change
`@@ -161,7 +161,7 @@`
`161`	`161`	"nutanix_port": "{{env `NUTANIX_PORT`}}",
`162`	`162`	"nutanix_subnet_name": "{{env `NUTANIX_SUBNET_NAME`}}",
`163`	`163`	"nutanix_username": "{{env `NUTANIX_USERNAME`}}",
`164`		`- "scp_extra_vars": "",`
	`164`	+ "scp_extra_vars": "{{user `ansible_scp_extra_args`}}",
`165`	`165`	`"vm_force_delete": "false",`
`166`	`166`	"windows_admin_password": "{{env `WINDOWS_ADMIN_PASSWORD`}}"
`167`	`167`	`}`