Merge pull request #560 from bshephar/remove-networkconfig

Use default single-nic-vlans.j2
openstack-k8s-operators · Sep 21, 2023 · 6f6d85b · 6f6d85b
2 parents def3c55 + 2eed4b1
commit 6f6d85b
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 9 deletions.
diff --git a/ci_framework/hooks/playbooks/fetch_compute_facts.yml b/ci_framework/hooks/playbooks/fetch_compute_facts.yml
@@ -130,9 +130,6 @@
               - target:
                   kind: OpenStackDataPlaneNodeSet
                 patch: |-
-                  - op: remove
-                    path: /spec/nodeTemplate/ansible/ansibleVars/edpm_network_config_template
-
                   - op: replace
                     path: /spec/nodeTemplate/ansible/ansibleVars/neutron_public_interface_name
                     value: "{{ crc_ci_bootstrap_networks_out.compute.default.iface | default('') }}"
@@ -167,9 +164,8 @@
                           nic2: "{{ crc_ci_bootstrap_networks_out.compute.default.iface | default('ens7') }}"
 
                   - op: replace
-                    path: /spec/nodeTemplate/networkConfig
-                    value:
-                      template: |-
+                    path: /spec/nodeTemplate/ansible/ansibleVars/edpm_network_config_override
+                    value: |-
                         {%- raw %}
                         ---
                         {% set mtu_list = [ctlplane_mtu] %}

diff --git a/...work/tests/integration/targets/make/files/get_makefiles_env/expected_variables_values.yml b/...work/tests/integration/targets/make/files/get_makefiles_env/expected_variables_values.yml
@@ -68,7 +68,6 @@ variables:
   DATAPLANE_KUTTL_CONF: "/home/test-user/out/operator/dataplane-operator/kuttl-test.yaml"
   DATAPLANE_KUTTL_DIR: "/home/test-user/out/operator/dataplane-operator/tests/kuttl/tests"
   DATAPLANE_KUTTL_NAMESPACE: "dataplane-kuttl-tests"
-  DATAPLANE_NETWORK_CONFIG_TEMPLATE: "templates/single_nic_vlans/single_nic_vlans.j2"
   DATAPLANE_NETWORK_INTERFACE_NAME: "eth0"
   DATAPLANE_OVN_METADATA_AGENT_BIND_HOST: "127.0.0.1"
   DATAPLANE_REGISTRY_URL: "quay.io/podified-antelope-centos9"

diff --git a/ci_framework/tests/integration/targets/make/files/get_makefiles_env/makefiles/Makefile b/ci_framework/tests/integration/targets/make/files/get_makefiles_env/makefiles/Makefile
@@ -294,7 +294,6 @@ DATAPLANE_COMPUTE_IP                             ?=192.168.122.100
 DATAPLANE_COMPUTE_1_IP                           ?=192.168.122.101
 DATAPLANE_TOTAL_NODES                            ?=2
 DATAPLANE_RUNNER_IMG                             ?=quay.io/openstack-k8s-operators/openstack-ansibleee-runner:latest
-DATAPLANE_NETWORK_CONFIG_TEMPLATE                ?=templates/single_nic_vlans/single_nic_vlans.j2
 DATAPLANE_NETWORK_INTERFACE_NAME                 ?=eth0
 DATAPLANE_SSHD_ALLOWED_RANGES                    ?=['192.168.122.0/24']
 DATAPLANE_CHRONY_NTP_SERVER                      ?=pool.ntp.org

diff --git a/...ramework/tests/integration/targets/make/files/get_makefiles_env/makefiles/subdir/Makefile b/...ramework/tests/integration/targets/make/files/get_makefiles_env/makefiles/subdir/Makefile
@@ -29,7 +29,6 @@ DATAPLANE_CHRONY_NTP_SERVER ?=pool.ntp.org
 METADATA_SHARED_SECRET   ?= 1234567842
 DATAPLANE_OVN_METADATA_AGENT_BIND_HOST ?=127.0.0.1
 DATAPLANE_SSHD_ALLOWED_RANGES ?=['192.168.122.0/24']
-DATAPLANE_NETWORK_CONFIG_TEMPLATE ?=templates/single_nic_vlans/single_nic_vlans.j2
 DATAPLANE_DEPLOY_STRATEGY_DEPLOY ?= false
 
 BM_PROVISIONING_INTERFACE  ?=enp6s0