From 884d189611c10d891b4a0a135c35e844e00265cd Mon Sep 17 00:00:00 2001 From: tusharjadhav3302 Date: Wed, 1 Jul 2026 10:26:57 +0530 Subject: [PATCH] Fix default(omit) placeholder leak in install-config template OSPRH-6485 Co-authored-by: Cursor --- .../tasks/install_config_generation/ipi_install_config.yml | 4 ++-- .../roles/install/templates/install-config-ipi.yaml.j2 | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/collection/stages/roles/install/tasks/install_config_generation/ipi_install_config.yml b/collection/stages/roles/install/tasks/install_config_generation/ipi_install_config.yml index 156aeee8..0eb66b3f 100644 --- a/collection/stages/roles/install/tasks/install_config_generation/ipi_install_config.yml +++ b/collection/stages/roles/install/tasks/install_config_generation/ipi_install_config.yml @@ -45,9 +45,9 @@ installcfg_api_vips: "{{ ocp_deployment_topology.primary_ip_protocol == 'ipv6' }}" installcfg_api_floating_ip: "{{ precreated_api_fip }}" installcfg_ingress_floating_ip: "{{ precreated_ingress_fip }}" - installcfg_machines_subnet: "{{ machines_subnet_id | default(omit) }}" + installcfg_machines_subnet: "{{ machines_subnet_id | default('') }}" installcfg_cluster_network: "{{ ocp_deployment_topology[ocp_deployment_topology.primary_ip_protocol].cluster_network }}" installcfg_service_network: "{{ ocp_deployment_topology[ocp_deployment_topology.primary_ip_protocol].service_network }}" installcfg_default_machine_platform: "{{ ocp_deployment_topology.defaultMachinePlatform | default({}) }}" installcfg_cluster_os_image_properties: "{{ ocp_deployment_topology.platform.openstack.clusterOSImageProperties | default({}) }}" - installcfg_additional_trust_bundle: "{{ _cacert_content.stdout_lines | default(omit) }}" + installcfg_additional_trust_bundle: "{{ _cacert_content.stdout_lines | default([]) }}" diff --git a/collection/stages/roles/install/templates/install-config-ipi.yaml.j2 b/collection/stages/roles/install/templates/install-config-ipi.yaml.j2 index b9dd21de..79c8c68b 100644 --- a/collection/stages/roles/install/templates/install-config-ipi.yaml.j2 +++ b/collection/stages/roles/install/templates/install-config-ipi.yaml.j2 @@ -45,7 +45,7 @@ platform: {{ key }}: {{ value }} {%- endfor +%} {%- endif +%} - {%- if installcfg_machines_subnet is defined +%} + {%- if installcfg_machines_subnet +%} machinesSubnet: {{ installcfg_machines_subnet }} {%- endif +%} {%- if installcfg_api_vips +%} @@ -64,7 +64,7 @@ platform: externalNetwork: "{{ installcfg_external_network }}" apiFloatingIP: "{{ installcfg_api_floating_ip }}" ingressFloatingIP: "{{ installcfg_ingress_floating_ip }}" - {%- if installcfg_machines_subnet is not defined +%} + {%- if not installcfg_machines_subnet +%} externalDNS: {{ installcfg_dns_servers }} {%- endif +%} {%- endif +%} @@ -72,7 +72,7 @@ pullSecret: | {{ ocp_pull_secret }} sshKey: | {{ ocp_public_key }} -{%- if installcfg_additional_trust_bundle is defined +%} +{%- if installcfg_additional_trust_bundle +%} additionalTrustBundle: | {% for line in installcfg_additional_trust_bundle %} {{ line }}