From 8614f96efac6c8282222f01e6b1a56eb0dfca4de Mon Sep 17 00:00:00 2001 From: Brendan Shephard Date: Fri, 22 Sep 2023 12:01:10 +1000 Subject: [PATCH] Update network-config-template to new format This commit updates the sample files to use the new format that will accept Jinja2 files instead of a file path. We maintain the edpm_network_config_override variable for now to be backwards compatible with other projects that depend on it existing. Signed-off-by: Brendan Shephard --- .../samples/dataplane_v1beta1_openstackdataplanenodeset.yaml | 4 ++-- ...dataplane_v1beta1_openstackdataplanenodeset_baremetal.yaml | 4 ++-- ...v1beta1_openstackdataplanenodeset_baremetal_with_ipam.yaml | 4 ++-- .../dataplane_v1beta1_openstackdataplanenodeset_ceph.yaml | 4 ++-- ...lane_v1beta1_openstackdataplanenodeset_customnetworks.yaml | 4 ++-- ...dataplane_v1beta1_openstackdataplanenodeset_with_ipam.yaml | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/config/samples/dataplane_v1beta1_openstackdataplanenodeset.yaml b/config/samples/dataplane_v1beta1_openstackdataplanenodeset.yaml index 74bb8574f..01f8a6780 100644 --- a/config/samples/dataplane_v1beta1_openstackdataplanenodeset.yaml +++ b/config/samples/dataplane_v1beta1_openstackdataplanenodeset.yaml @@ -46,8 +46,8 @@ spec: # Default nic config template for a EDPM compute node # These vars are edpm_network_config role vars edpm_network_config_hide_sensitive_logs: false - edpm_network_config_template: templates/single_nic_vlans/single_nic_vlans.j2 - edpm_network_config_override: | + edpm_network_config_override: "" + edpm_network_config_template: | --- {% set mtu_list = [ctlplane_mtu] %} {% for network in role_networks %} diff --git a/config/samples/dataplane_v1beta1_openstackdataplanenodeset_baremetal.yaml b/config/samples/dataplane_v1beta1_openstackdataplanenodeset_baremetal.yaml index ec5e5a28a..01feee265 100644 --- a/config/samples/dataplane_v1beta1_openstackdataplanenodeset_baremetal.yaml +++ b/config/samples/dataplane_v1beta1_openstackdataplanenodeset_baremetal.yaml @@ -68,8 +68,8 @@ spec: # Default nic config template for a EDPM compute node # These vars are edpm_network_config role vars edpm_network_config_hide_sensitive_logs: false - edpm_network_config_template: templates/single_nic_vlans/single_nic_vlans.j2 - edpm_network_config_override: | + edpm_network_config_override: "" + edpm_network_config_template: | --- {% set mtu_list = [ctlplane_mtu] %} {% for network in role_networks %} diff --git a/config/samples/dataplane_v1beta1_openstackdataplanenodeset_baremetal_with_ipam.yaml b/config/samples/dataplane_v1beta1_openstackdataplanenodeset_baremetal_with_ipam.yaml index ae34ad1ef..7b485beff 100644 --- a/config/samples/dataplane_v1beta1_openstackdataplanenodeset_baremetal_with_ipam.yaml +++ b/config/samples/dataplane_v1beta1_openstackdataplanenodeset_baremetal_with_ipam.yaml @@ -54,8 +54,8 @@ spec: # Default nic config template for a EDPM compute node # These vars are edpm_network_config role vars edpm_network_config_hide_sensitive_logs: false - edpm_network_config_template: templates/single_nic_vlans/single_nic_vlans.j2 - edpm_network_config_override: | + edpm_network_config_override: "" + edpm_network_config_template: | --- {% set mtu_list = [ctlplane_mtu] %} {% for network in role_networks %} diff --git a/config/samples/dataplane_v1beta1_openstackdataplanenodeset_ceph.yaml b/config/samples/dataplane_v1beta1_openstackdataplanenodeset_ceph.yaml index 0d861ebda..b2927825d 100644 --- a/config/samples/dataplane_v1beta1_openstackdataplanenodeset_ceph.yaml +++ b/config/samples/dataplane_v1beta1_openstackdataplanenodeset_ceph.yaml @@ -56,8 +56,8 @@ spec: # edpm_network_config # Default nic config template for a EDPM compute node # These vars are edpm_network_config role vars - edpm_network_config_template: templates/single_nic_vlans/single_nic_vlans.j2 - edpm_network_config_override: | + edpm_network_config_override: "" + edpm_network_config_template: | --- {% set mtu_list = [ctlplane_mtu] %} {% for network in role_networks %} diff --git a/config/samples/dataplane_v1beta1_openstackdataplanenodeset_customnetworks.yaml b/config/samples/dataplane_v1beta1_openstackdataplanenodeset_customnetworks.yaml index 3bb4b12b0..b79056412 100644 --- a/config/samples/dataplane_v1beta1_openstackdataplanenodeset_customnetworks.yaml +++ b/config/samples/dataplane_v1beta1_openstackdataplanenodeset_customnetworks.yaml @@ -48,8 +48,8 @@ spec: # edpm_network_config # Default nic config template for a EDPM compute node # These vars are edpm_network_config role vars - edpm_network_config_template: templates/single_nic_vlans/single_nic_vlans.j2 - edpm_network_config_override: | + edpm_network_config_override: "" + edpm_network_config_template: | --- {% set mtu_list = [ctlplane_mtu] %} {% for network in role_networks %} diff --git a/config/samples/dataplane_v1beta1_openstackdataplanenodeset_with_ipam.yaml b/config/samples/dataplane_v1beta1_openstackdataplanenodeset_with_ipam.yaml index 67c53bc97..82b7a6cf5 100644 --- a/config/samples/dataplane_v1beta1_openstackdataplanenodeset_with_ipam.yaml +++ b/config/samples/dataplane_v1beta1_openstackdataplanenodeset_with_ipam.yaml @@ -66,8 +66,8 @@ spec: # edpm_network_config # Default nic config template for a EDPM compute node # These vars are edpm_network_config role vars - edpm_network_config_template: templates/single_nic_vlans/single_nic_vlans.j2 - edpm_network_config_override: | + edpm_network_config_override: "" + edpm_network_config_template: | --- {% set mtu_list = [ctlplane_mtu] %} {% for network in role_networks %}