diff --git a/ci_framework/hooks/playbooks/fetch_compute_facts.yml b/ci_framework/hooks/playbooks/fetch_compute_facts.yml index 870e7de6fd..9fafcc97bc 100644 --- a/ci_framework/hooks/playbooks/fetch_compute_facts.yml +++ b/ci_framework/hooks/playbooks/fetch_compute_facts.yml @@ -93,9 +93,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('') }}" diff --git a/ci_framework/tests/integration/targets/make/files/get_makefiles_env/expected_variables_values.yml b/ci_framework/tests/integration/targets/make/files/get_makefiles_env/expected_variables_values.yml index 3b049b40d3..c88a08cae0 100644 --- a/ci_framework/tests/integration/targets/make/files/get_makefiles_env/expected_variables_values.yml +++ b/ci_framework/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 index c807045097..673a73628f 100644 --- 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/ci_framework/tests/integration/targets/make/files/get_makefiles_env/makefiles/subdir/Makefile b/ci_framework/tests/integration/targets/make/files/get_makefiles_env/makefiles/subdir/Makefile index bb10b1909c..d53fce541b 100644 --- a/ci_framework/tests/integration/targets/make/files/get_makefiles_env/makefiles/subdir/Makefile +++ b/ci_framework/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