From e5c0f8a46c2db337f97a8f195daa0ad4e18017fa Mon Sep 17 00:00:00 2001
From: Josh Patterson <josh.patterson@securityonionsolutions.com>
Date: Wed, 30 Apr 2025 16:09:57 -0400
Subject: [PATCH] allow for dhcp4

---
 salt/manager/tools/sbin_jinja/so-salt-cloud | 24 +++++++++++++++------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/salt/manager/tools/sbin_jinja/so-salt-cloud b/salt/manager/tools/sbin_jinja/so-salt-cloud
index f1346130f..bf15efcc2 100644
--- a/salt/manager/tools/sbin_jinja/so-salt-cloud
+++ b/salt/manager/tools/sbin_jinja/so-salt-cloud
@@ -504,16 +504,26 @@ def run_qcow2_modify_network_config(profile, vm_name, mode, ip=None, gateway=Non
     interface = 'enp1s0'
 
     try:
-        result = local.cmd(target, 'qcow2.modify_network_config', [
+        # Base arguments that are always included
+        args = [
             'image=' + image,
             'interface=' + interface,
             'mode=' + mode,
-            'vm_name=' + vm_name,
-            'ip4=' + ip if ip else '',
-            'gw4=' + gateway if gateway else '',
-            'dns4=' + dns if dns else '',
-            'search4=' + search_domain if search_domain else ''
-        ])
+            'vm_name=' + vm_name
+        ]
+        
+        # Only include IP-related arguments if not using DHCP
+        if mode != "dhcp4":
+            if ip:
+                args.append('ip4=' + ip)
+            if gateway:
+                args.append('gw4=' + gateway)
+            if dns:
+                args.append('dns4=' + dns)
+            if search_domain:
+                args.append('search4=' + search_domain)
+                
+        result = local.cmd(target, 'qcow2.modify_network_config', args)
         format_qcow2_output('Network configuration', result)
     except Exception as e:
         logger.error(f"An error occurred while running qcow2.modify_network_config: {e}")