Merge pull request openstack-k8s-operators#625 from hjensas/OSPRH-20483

Fix IPv6 URL formatting in init scripts

Author: hjensas

templates/ironicconductor/bin/init.sh

@@ -33,7 +33,28 @@ if [ -n "${ProvisionNetwork}" ]; then
 fi
 
 
-export DEPLOY_HTTP_URL=$(python3 -c 'import os; print(os.environ["DeployHTTPURL"] % os.environ)')
+export DEPLOY_HTTP_URL=$(python3 -c '
+import os
+import ipaddress
+
+# Get the IP address
+ip_str = os.environ.get("ProvisionNetworkIP", "")
+
+# Check if it is an IPv6 address and format accordingly
+try:
+    ip = ipaddress.ip_address(ip_str)
+    if isinstance(ip, ipaddress.IPv6Address):
+        # For IPv6, we need to wrap the IP in brackets for URL formatting
+        formatted_env = dict(os.environ)
+        formatted_env["ProvisionNetworkIP"] = f"[{ip_str}]"
+        print(os.environ["DeployHTTPURL"] % formatted_env)
+    else:
+        # For IPv4, use as-is
+        print(os.environ["DeployHTTPURL"] % os.environ)
+except ValueError:
+    # If IP parsing fails, use as-is (fallback)
+    print(os.environ["DeployHTTPURL"] % os.environ)
+')
 
 crudini --set ${INIT_CONFIG} deploy http_url ${DEPLOY_HTTP_URL}
 crudini --set ${INIT_CONFIG} conductor bootloader ${DEPLOY_HTTP_URL}esp.img

templates/ironicinspector/bin/inspector-pxe-init.sh

@@ -20,7 +20,48 @@ export PODINDEX=$(echo ${HOSTNAME##*-})
 
 # DHCP server configuration
 export InspectorNetworkIP=$(/usr/local/bin/container-scripts/get_net_ip ${InspectionNetwork})
-export INSPECTOR_HTTP_URL=$(python3 -c 'import os; print(os.environ["InspectorHTTPURL"] % os.environ)')
+export INSPECTOR_HTTP_URL=$(python3 -c '
+import os
+import ipaddress
+
+# Get the IP address
+ip_str = os.environ.get("InspectorNetworkIP", "")
+
+# Check if it is an IPv6 address and format accordingly
+try:
+    ip = ipaddress.ip_address(ip_str)
+    if isinstance(ip, ipaddress.IPv6Address):
+        # For IPv6, we need to wrap the IP in brackets for URL formatting
+        formatted_env = dict(os.environ)
+        formatted_env["InspectorNetworkIP"] = f"[{ip_str}]"
+        print(os.environ["InspectorHTTPURL"] % formatted_env)
+    else:
+        # For IPv4, use as-is
+        print(os.environ["InspectorHTTPURL"] % os.environ)
+except ValueError:
+    # If IP parsing fails, use as-is (fallback)
+    print(os.environ["InspectorHTTPURL"] % os.environ)
+')
+
+# Export URL-formatted IP for use in config templates
+export InspectorNetworkIPForURL=$(python3 -c '
+import os
+import ipaddress
+
+# Get the IP address
+ip_str = os.environ.get("InspectorNetworkIP", "")
+
+# Check if it is an IPv6 address and format accordingly
+try:
+    ip = ipaddress.ip_address(ip_str)
+    if isinstance(ip, ipaddress.IPv6Address):
+        print(f"[{ip_str}]")
+    else:
+        print(ip_str)
+except ValueError:
+    # If IP parsing fails, use as-is (fallback)
+    print(ip_str)
+')
 
 # Copy required config to modifiable location
 cp /var/lib/config-data/default/dnsmasq.conf /var/lib/ironic/

templates/ironicinspector/config/dnsmasq.conf

@@ -61,7 +61,7 @@ dhcp-option=tag:ipxe6,option6:bootfile-url,${INSPECTOR_HTTP_URL}inspector.ipxe
 
 # Client is PXE booting over EFI without iPXE ROM; send EFI version of iPXE chainloader
 dhcp-boot=tag:efi,tag:!ipxe,snponly.efi
-dhcp-option=tag:efi6,tag:!ipxe6,option6:bootfile-url,tftp://${InspectorNetworkIP}/snponly.efi
+dhcp-option=tag:efi6,tag:!ipxe6,option6:bootfile-url,tftp://${InspectorNetworkIPForURL}/snponly.efi
 
 # Client is running PXE over BIOS; send BIOS version of iPXE chainloader
-dhcp-boot=undionly.kpxe,localhost.localdomain,${InspectorNetworkIP}
+dhcp-boot=undionly.kpxe,localhost.localdomain,${InspectorNetworkIPForURL}

templates/ironicinspector/config/inspector.ipxe

@@ -2,6 +2,6 @@
 
 :retry_boot
 imgfree
-kernel --timeout 60000 ${INSPECTOR_HTTP_URL}ironic-python-agent.kernel ipa-inspection-callback-url=http://${InspectorNetworkIP}:5050/v1/continue ipa-inspection-collectors=default,extra-hardware,numa-topology,logs systemd.journald.forward_to_console=yes BOOTIF=${mac} ipa-inspection-dhcp-all-interfaces=1 ipa-collect-lldp=1 initrd=ironic-python-agent.initramfs || goto retry_boot
+kernel --timeout 60000 ${INSPECTOR_HTTP_URL}ironic-python-agent.kernel ipa-inspection-callback-url=http://${InspectorNetworkIPForURL}:5050/v1/continue ipa-inspection-collectors=default,extra-hardware,numa-topology,logs systemd.journald.forward_to_console=yes BOOTIF=${mac} ipa-inspection-dhcp-all-interfaces=1 ipa-collect-lldp=1 initrd=ironic-python-agent.initramfs || goto retry_boot
 initrd --timeout 60000 ${INSPECTOR_HTTP_URL}ironic-python-agent.initramfs || goto retry_boot
 boot