Merge pull request #426 from bshephar/update-network-config-template

Update network-config-template to new format
openstack-k8s-operators · Sep 22, 2023 · 981db11 · 981db11
2 parents 83a8c66 + 8614f96
commit 981db11
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 %}