From 940d8476949a7c0e36c66c825f253afc9f570edf Mon Sep 17 00:00:00 2001 From: rabi Date: Tue, 29 Jul 2025 13:43:29 +0530 Subject: [PATCH] Fix ansible 2.19 jinja incompatibilities With ansible 2.19 it prints the return value of the mtu_list.append() `None` and the network config is not parseable with os-net-config and it fails with, os_net_config.main No interfaces defined in config: /etc/os-net-config/config.yaml"]} jira: OSPRH-18609 Signed-off-by: rabi --- config/samples/dataplane/base/files/nic-config.j2 | 2 +- config/samples/dataplane/bgp/values.yaml | 2 +- config/samples/dataplane/bgp_ovn_cluster/values.yaml | 2 +- config/samples/dataplane/nmstate/values.yaml | 2 +- config/samples/dataplane/ovs_dpdk/values.yaml | 2 +- config/samples/dataplane/post_ceph_hci/values.yaml | 2 +- config/samples/dataplane/pre_ceph_hci/values.yaml | 2 +- config/samples/nic-config-samples/bonds_vlans/bonds_vlans.j2 | 2 +- .../samples/nic-config-samples/bonds_vlans/bonds_vlans_dpdk.j2 | 2 +- .../nic-config-samples/bonds_vlans/bonds_vlans_storage.j2 | 2 +- .../nic-config-samples/bonds_vlans/controller_no_external.j2 | 2 +- .../single_nic_vlans/controller_no_external.j2 | 2 +- .../nic-config-samples/single_nic_vlans/single_nic_vlans.j2 | 2 +- .../nic-config-samples/single_nic_vlans/single_nic_vlans_bgp.j2 | 2 +- .../single_nic_vlans/single_nic_vlans_bgp_ovn.j2 | 2 +- .../single_nic_vlans/single_nic_vlans_storage.j2 | 2 +- docs/assemblies/common_configurations.adoc | 2 +- ...ample-OpenStackDataPlaneNodeSet-CR-for-bare-metal-nodes.adoc | 2 +- ...e-OpenStackDataPlaneNodeSet-CR-for-preprovisioned-nodes.adoc | 2 +- .../kuttl/tests/dataplane-create-test/00-dataplane-create.yaml | 2 +- .../00-dataplane-create.yaml | 2 +- .../tests/dataplane-deploy-tls-test/00-dataplane-create.yaml | 2 +- .../00-dataplane-create.yaml | 2 +- 23 files changed, 23 insertions(+), 23 deletions(-) diff --git a/config/samples/dataplane/base/files/nic-config.j2 b/config/samples/dataplane/base/files/nic-config.j2 index 9fb986c1e6..028de8bc56 100644 --- a/config/samples/dataplane/base/files/nic-config.j2 +++ b/config/samples/dataplane/base/files/nic-config.j2 @@ -1,7 +1,7 @@ --- {% set mtu_list = [ctlplane_mtu] %} {% for network in nodeset_networks %} -{{ mtu_list.append(lookup('vars', networks_lower[network] ~ '_mtu')) }} +{% set _ = mtu_list.append(lookup('vars', networks_lower[network] ~ '_mtu')) %} {%- endfor %} {% set min_viable_mtu = mtu_list | max %} network_config: diff --git a/config/samples/dataplane/bgp/values.yaml b/config/samples/dataplane/bgp/values.yaml index 45c531ee2d..395e2b4ea8 100644 --- a/config/samples/dataplane/bgp/values.yaml +++ b/config/samples/dataplane/bgp/values.yaml @@ -20,7 +20,7 @@ data: --- {% set mtu_list = [ctlplane_mtu] %} {% for network in nodeset_networks %} - {{ mtu_list.append(lookup('vars', networks_lower[network] ~ '_mtu')) }} + {% set _= mtu_list.append(lookup('vars', networks_lower[network] ~ '_mtu')) %} {%- endfor %} {% set min_viable_mtu = mtu_list | max %} network_config: diff --git a/config/samples/dataplane/bgp_ovn_cluster/values.yaml b/config/samples/dataplane/bgp_ovn_cluster/values.yaml index ae5a28cce0..c60994d2b3 100644 --- a/config/samples/dataplane/bgp_ovn_cluster/values.yaml +++ b/config/samples/dataplane/bgp_ovn_cluster/values.yaml @@ -20,7 +20,7 @@ data: --- {% set mtu_list = [ctlplane_mtu] %} {% for network in nodeset_networks %} - {{ mtu_list.append(lookup('vars', networks_lower[network] ~ '_mtu')) }} + {% set _ = mtu_list.append(lookup('vars', networks_lower[network] ~ '_mtu')) %} {%- endfor %} {% set min_viable_mtu = mtu_list | max %} network_config: diff --git a/config/samples/dataplane/nmstate/values.yaml b/config/samples/dataplane/nmstate/values.yaml index 26af1b7b61..064d6e1b3b 100644 --- a/config/samples/dataplane/nmstate/values.yaml +++ b/config/samples/dataplane/nmstate/values.yaml @@ -15,7 +15,7 @@ data: --- {% set mtu_list = [ctlplane_mtu] %} {% for network in nodeset_networks %} - {{ mtu_list.append(lookup('vars', networks_lower[network] ~ '_mtu')) }} + {% set _ = mtu_list.append(lookup('vars', networks_lower[network] ~ '_mtu')) %} {%- endfor %} {% set min_viable_mtu = mtu_list | max %} dns-resolver: diff --git a/config/samples/dataplane/ovs_dpdk/values.yaml b/config/samples/dataplane/ovs_dpdk/values.yaml index 90f742dfc9..5f0fe5eeed 100644 --- a/config/samples/dataplane/ovs_dpdk/values.yaml +++ b/config/samples/dataplane/ovs_dpdk/values.yaml @@ -21,7 +21,7 @@ data: --- {% set mtu_list = [ctlplane_mtu] %} {% for network in nodeset_networks %} - {{ mtu_list.append(lookup('vars', networks_lower[network] ~ '_mtu')) }} + {% set _ = mtu_list.append(lookup('vars', networks_lower[network] ~ '_mtu')) %} {%- endfor %} {% set min_viable_mtu = mtu_list | max %} network_config: diff --git a/config/samples/dataplane/post_ceph_hci/values.yaml b/config/samples/dataplane/post_ceph_hci/values.yaml index f2cb13e310..4b2b8caabf 100644 --- a/config/samples/dataplane/post_ceph_hci/values.yaml +++ b/config/samples/dataplane/post_ceph_hci/values.yaml @@ -22,7 +22,7 @@ data: --- {% set mtu_list = [ctlplane_mtu] %} {% for network in nodeset_networks %} - {{ mtu_list.append(lookup('vars', networks_lower[network] ~ '_mtu')) }} + {% set _ = mtu_list.append(lookup('vars', networks_lower[network] ~ '_mtu')) %} {%- endfor %} {% set min_viable_mtu = mtu_list | max %} network_config: diff --git a/config/samples/dataplane/pre_ceph_hci/values.yaml b/config/samples/dataplane/pre_ceph_hci/values.yaml index aed3f106d1..570347570c 100644 --- a/config/samples/dataplane/pre_ceph_hci/values.yaml +++ b/config/samples/dataplane/pre_ceph_hci/values.yaml @@ -25,7 +25,7 @@ data: --- {% set mtu_list = [ctlplane_mtu] %} {% for network in nodeset_networks %} - {{ mtu_list.append(lookup('vars', networks_lower[network] ~ '_mtu')) }} + {% set _ = mtu_list.append(lookup('vars', networks_lower[network] ~ '_mtu')) %} {%- endfor %} {% set min_viable_mtu = mtu_list | max %} network_config: diff --git a/config/samples/nic-config-samples/bonds_vlans/bonds_vlans.j2 b/config/samples/nic-config-samples/bonds_vlans/bonds_vlans.j2 index ca64ede877..a2b69a16c1 100644 --- a/config/samples/nic-config-samples/bonds_vlans/bonds_vlans.j2 +++ b/config/samples/nic-config-samples/bonds_vlans/bonds_vlans.j2 @@ -1,7 +1,7 @@ --- {% set mtu_list = [ctlplane_mtu] %} {% for network in nodeset_networks %} -{{ mtu_list.append(lookup('vars', networks_lower[network] ~ '_mtu')) }} +{% set _ = mtu_list.append(lookup('vars', networks_lower[network] ~ '_mtu')) %} {%- endfor %} {% set min_viable_mtu = mtu_list | max %} network_config: diff --git a/config/samples/nic-config-samples/bonds_vlans/bonds_vlans_dpdk.j2 b/config/samples/nic-config-samples/bonds_vlans/bonds_vlans_dpdk.j2 index 12b414282a..5ede46d664 100644 --- a/config/samples/nic-config-samples/bonds_vlans/bonds_vlans_dpdk.j2 +++ b/config/samples/nic-config-samples/bonds_vlans/bonds_vlans_dpdk.j2 @@ -1,7 +1,7 @@ --- {% set mtu_list = [ctlplane_mtu] %} {% for network in nodeset_networks %} -{{ mtu_list.append(lookup('vars', networks_lower[network] ~ '_mtu')) }} +{% set _ = mtu_list.append(lookup('vars', networks_lower[network] ~ '_mtu')) %} {%- endfor %} {% set min_viable_mtu = mtu_list | max %} network_config: diff --git a/config/samples/nic-config-samples/bonds_vlans/bonds_vlans_storage.j2 b/config/samples/nic-config-samples/bonds_vlans/bonds_vlans_storage.j2 index e7f94f4230..4b2d0cb674 100644 --- a/config/samples/nic-config-samples/bonds_vlans/bonds_vlans_storage.j2 +++ b/config/samples/nic-config-samples/bonds_vlans/bonds_vlans_storage.j2 @@ -1,7 +1,7 @@ --- {% set mtu_list = [ctlplane_mtu] %} {% for network in nodeset_networks %} -{{ mtu_list.append(lookup('vars', networks_lower[network] ~ '_mtu')) }} +{% set _ = mtu_list.append(lookup('vars', networks_lower[network] ~ '_mtu')) %} {%- endfor %} {% set min_viable_mtu = mtu_list | max %} network_config: diff --git a/config/samples/nic-config-samples/bonds_vlans/controller_no_external.j2 b/config/samples/nic-config-samples/bonds_vlans/controller_no_external.j2 index 867ccfda13..f31315c013 100644 --- a/config/samples/nic-config-samples/bonds_vlans/controller_no_external.j2 +++ b/config/samples/nic-config-samples/bonds_vlans/controller_no_external.j2 @@ -1,7 +1,7 @@ --- {% set mtu_list = [ctlplane_mtu] %} {% for network in nodeset_networks %} -{{ mtu_list.append(lookup('vars', networks_lower[network] ~ '_mtu')) }} +{% set _ = mtu_list.append(lookup('vars', networks_lower[network] ~ '_mtu')) %} {%- endfor %} {% set min_viable_mtu = mtu_list | max %} network_config: diff --git a/config/samples/nic-config-samples/single_nic_vlans/controller_no_external.j2 b/config/samples/nic-config-samples/single_nic_vlans/controller_no_external.j2 index 51639be766..f3a480b393 100644 --- a/config/samples/nic-config-samples/single_nic_vlans/controller_no_external.j2 +++ b/config/samples/nic-config-samples/single_nic_vlans/controller_no_external.j2 @@ -1,7 +1,7 @@ --- {% set mtu_list = [ctlplane_mtu] %} {% for network in nodeset_networks %} -{{ mtu_list.append(lookup('vars', networks_lower[network] ~ '_mtu')) }} +{% set _ = mtu_list.append(lookup('vars', networks_lower[network] ~ '_mtu')) %} {%- endfor %} {% set min_viable_mtu = mtu_list | max %} network_config: diff --git a/config/samples/nic-config-samples/single_nic_vlans/single_nic_vlans.j2 b/config/samples/nic-config-samples/single_nic_vlans/single_nic_vlans.j2 index 9fb986c1e6..028de8bc56 100644 --- a/config/samples/nic-config-samples/single_nic_vlans/single_nic_vlans.j2 +++ b/config/samples/nic-config-samples/single_nic_vlans/single_nic_vlans.j2 @@ -1,7 +1,7 @@ --- {% set mtu_list = [ctlplane_mtu] %} {% for network in nodeset_networks %} -{{ mtu_list.append(lookup('vars', networks_lower[network] ~ '_mtu')) }} +{% set _ = mtu_list.append(lookup('vars', networks_lower[network] ~ '_mtu')) %} {%- endfor %} {% set min_viable_mtu = mtu_list | max %} network_config: diff --git a/config/samples/nic-config-samples/single_nic_vlans/single_nic_vlans_bgp.j2 b/config/samples/nic-config-samples/single_nic_vlans/single_nic_vlans_bgp.j2 index c9b7738e2f..f420d0562e 100644 --- a/config/samples/nic-config-samples/single_nic_vlans/single_nic_vlans_bgp.j2 +++ b/config/samples/nic-config-samples/single_nic_vlans/single_nic_vlans_bgp.j2 @@ -1,7 +1,7 @@ --- {% set mtu_list = [ctlplane_mtu] %} {% for network in nodeset_networks %} -{{ mtu_list.append(lookup('vars', networks_lower[network] ~ '_mtu')) }} +{% set _ = mtu_list.append(lookup('vars', networks_lower[network] ~ '_mtu')) %} {%- endfor %} {% set min_viable_mtu = mtu_list | max %} network_config: diff --git a/config/samples/nic-config-samples/single_nic_vlans/single_nic_vlans_bgp_ovn.j2 b/config/samples/nic-config-samples/single_nic_vlans/single_nic_vlans_bgp_ovn.j2 index 340e74de5f..b58c525e1b 100644 --- a/config/samples/nic-config-samples/single_nic_vlans/single_nic_vlans_bgp_ovn.j2 +++ b/config/samples/nic-config-samples/single_nic_vlans/single_nic_vlans_bgp_ovn.j2 @@ -1,7 +1,7 @@ --- {% set mtu_list = [ctlplane_mtu] %} {% for network in nodeset_networks %} -{{ mtu_list.append(lookup('vars', networks_lower[network] ~ '_mtu')) }} +{% set _ = mtu_list.append(lookup('vars', networks_lower[network] ~ '_mtu')) %} {%- endfor %} {% set min_viable_mtu = mtu_list | max %} network_config: diff --git a/config/samples/nic-config-samples/single_nic_vlans/single_nic_vlans_storage.j2 b/config/samples/nic-config-samples/single_nic_vlans/single_nic_vlans_storage.j2 index 3bff994c52..de21672d2c 100644 --- a/config/samples/nic-config-samples/single_nic_vlans/single_nic_vlans_storage.j2 +++ b/config/samples/nic-config-samples/single_nic_vlans/single_nic_vlans_storage.j2 @@ -1,7 +1,7 @@ --- {% set mtu_list = [ctlplane_mtu] %} {% for network in nodeset_networks %} -{{ mtu_list.append(lookup('vars', networks_lower[network] ~ '_mtu')) }} +{% set _ = mtu_list.append(lookup('vars', networks_lower[network] ~ '_mtu')) %} {%- endfor %} {% set min_viable_mtu = mtu_list | max %} network_config: diff --git a/docs/assemblies/common_configurations.adoc b/docs/assemblies/common_configurations.adoc index 24d13a1ec6..88edf19edd 100644 --- a/docs/assemblies/common_configurations.adoc +++ b/docs/assemblies/common_configurations.adoc @@ -155,7 +155,7 @@ field that shows defining the variables that configure the --- {% set mtu_list = [ctlplane_mtu] %} {% for network in nodeset_networks %} - {{ mtu_list.append(lookup('vars', networks_lower[network] ~ '_mtu')) }} + {% set _ = mtu_list.append(lookup('vars', networks_lower[network] ~ '_mtu')) %} {%- endfor %} {% set min_viable_mtu = mtu_list | max %} network_config: diff --git a/docs/assemblies/ref_example-OpenStackDataPlaneNodeSet-CR-for-bare-metal-nodes.adoc b/docs/assemblies/ref_example-OpenStackDataPlaneNodeSet-CR-for-bare-metal-nodes.adoc index dd32730739..d5f041a3f3 100644 --- a/docs/assemblies/ref_example-OpenStackDataPlaneNodeSet-CR-for-bare-metal-nodes.adoc +++ b/docs/assemblies/ref_example-OpenStackDataPlaneNodeSet-CR-for-bare-metal-nodes.adoc @@ -29,7 +29,7 @@ spec: --- {% set mtu_list = [ctlplane_mtu] %} {% for network in nodeset_networks %} - {{ mtu_list.append(lookup('vars', networks_lower[network] ~ '_mtu')) }} + {% set _ = mtu_list.append(lookup('vars', networks_lower[network] ~ '_mtu')) %} {%- endfor %} {% set min_viable_mtu = mtu_list | max %} network_config: diff --git a/docs/assemblies/ref_example-OpenStackDataPlaneNodeSet-CR-for-preprovisioned-nodes.adoc b/docs/assemblies/ref_example-OpenStackDataPlaneNodeSet-CR-for-preprovisioned-nodes.adoc index 838a307133..b12101b379 100644 --- a/docs/assemblies/ref_example-OpenStackDataPlaneNodeSet-CR-for-preprovisioned-nodes.adoc +++ b/docs/assemblies/ref_example-OpenStackDataPlaneNodeSet-CR-for-preprovisioned-nodes.adoc @@ -24,7 +24,7 @@ spec: --- {% set mtu_list = [ctlplane_mtu] %} {% for network in nodeset_networks %} - {{ mtu_list.append(lookup('vars', networks_lower[network] ~ '_mtu')) }} + {% set _ = mtu_list.append(lookup('vars', networks_lower[network] ~ '_mtu')) %} {%- endfor %} {% set min_viable_mtu = mtu_list | max %} network_config: diff --git a/tests/kuttl/tests/dataplane-create-test/00-dataplane-create.yaml b/tests/kuttl/tests/dataplane-create-test/00-dataplane-create.yaml index a7f7b889eb..061df8aeb9 100644 --- a/tests/kuttl/tests/dataplane-create-test/00-dataplane-create.yaml +++ b/tests/kuttl/tests/dataplane-create-test/00-dataplane-create.yaml @@ -7,7 +7,7 @@ data: --- {% set mtu_list = [ctlplane_mtu] %} {% for network in nodeset_networks %} - {{ mtu_list.append(lookup('vars', networks_lower[network] ~ '_mtu')) }} + {% set _ = mtu_list.append(lookup('vars', networks_lower[network] ~ '_mtu')) %} {%- endfor %} {% set min_viable_mtu = mtu_list | max %} network_config: diff --git a/tests/kuttl/tests/dataplane-deploy-global-service-test/00-dataplane-create.yaml b/tests/kuttl/tests/dataplane-deploy-global-service-test/00-dataplane-create.yaml index 0aff417189..3084a26f28 100644 --- a/tests/kuttl/tests/dataplane-deploy-global-service-test/00-dataplane-create.yaml +++ b/tests/kuttl/tests/dataplane-deploy-global-service-test/00-dataplane-create.yaml @@ -100,7 +100,7 @@ data: --- {% set mtu_list = [ctlplane_mtu] %} {% for network in nodeset_networks %} - {{ mtu_list.append(lookup('vars', networks_lower[network] ~ '_mtu')) }} + {% set _ = mtu_list.append(lookup('vars', networks_lower[network] ~ '_mtu')) %} {%- endfor %} {% set min_viable_mtu = mtu_list | max %} network_config: diff --git a/tests/kuttl/tests/dataplane-deploy-tls-test/00-dataplane-create.yaml b/tests/kuttl/tests/dataplane-deploy-tls-test/00-dataplane-create.yaml index c84c2fd34d..d48fe8271e 100644 --- a/tests/kuttl/tests/dataplane-deploy-tls-test/00-dataplane-create.yaml +++ b/tests/kuttl/tests/dataplane-deploy-tls-test/00-dataplane-create.yaml @@ -44,7 +44,7 @@ data: --- {% set mtu_list = [ctlplane_mtu] %} {% for network in nodeset_networks %} - {{ mtu_list.append(lookup('vars', networks_lower[network] ~ '_mtu')) }} + {% set _ = mtu_list.append(lookup('vars', networks_lower[network] ~ '_mtu')) %} {%- endfor %} {% set min_viable_mtu = mtu_list | max %} network_config: diff --git a/tests/kuttl/tests/dataplane-multinode-nodeset-create-test/00-dataplane-create.yaml b/tests/kuttl/tests/dataplane-multinode-nodeset-create-test/00-dataplane-create.yaml index 247cd9ecc3..377f7e3adf 100644 --- a/tests/kuttl/tests/dataplane-multinode-nodeset-create-test/00-dataplane-create.yaml +++ b/tests/kuttl/tests/dataplane-multinode-nodeset-create-test/00-dataplane-create.yaml @@ -7,7 +7,7 @@ data: --- {% set mtu_list = [ctlplane_mtu] %} {% for network in nodeset_networks %} - {{ mtu_list.append(lookup('vars', networks_lower[network] ~ '_mtu')) }} + {% set _ = mtu_list.append(lookup('vars', networks_lower[network] ~ '_mtu')) %} {%- endfor %} {% set min_viable_mtu = mtu_list | max %} network_config: