From 6ef58e68e88b73d81bcd43cb4407dafa030a116c Mon Sep 17 00:00:00 2001 From: James Slagle Date: Wed, 17 Apr 2024 15:41:51 -0400 Subject: [PATCH] More service_net_map cleanup service_net_map is no longer used by anything Signed-off-by: James Slagle --- examples/post_ceph_hci/values.yaml | 3 --- examples/pre_ceph_hci/values.yaml | 3 --- tests/kuttl/tests/dataplane-create-test/00-assert.yaml | 3 --- .../kuttl/tests/dataplane-create-test/00-dataplane-create.yaml | 3 --- .../tests/dataplane-deploy-global-service-test/00-assert.yaml | 3 --- .../00-dataplane-create.yaml | 3 --- 6 files changed, 18 deletions(-) diff --git a/examples/post_ceph_hci/values.yaml b/examples/post_ceph_hci/values.yaml index b78741028..03562d547 100644 --- a/examples/post_ceph_hci/values.yaml +++ b/examples/post_ceph_hci/values.yaml @@ -70,9 +70,6 @@ data: neutron_physical_bridge_name: br-ex neutron_public_interface_name: eth0 registry_url: quay.io/podified-antelope-centos9 - service_net_map: - nova_api_network: internalapi - nova_libvirt_network: internalapi edpm_ceph_hci_pre_enabled_services: - ceph_mon - ceph_mgr diff --git a/examples/pre_ceph_hci/values.yaml b/examples/pre_ceph_hci/values.yaml index bd5ff3e9a..109b22d10 100644 --- a/examples/pre_ceph_hci/values.yaml +++ b/examples/pre_ceph_hci/values.yaml @@ -70,9 +70,6 @@ data: neutron_physical_bridge_name: br-ex neutron_public_interface_name: eth0 registry_url: quay.io/podified-antelope-centos9 - service_net_map: - nova_api_network: internalapi - nova_libvirt_network: internalapi edpm_ceph_hci_pre_enabled_services: - ceph_mon - ceph_mgr diff --git a/tests/kuttl/tests/dataplane-create-test/00-assert.yaml b/tests/kuttl/tests/dataplane-create-test/00-assert.yaml index d705631b8..f9607998d 100644 --- a/tests/kuttl/tests/dataplane-create-test/00-assert.yaml +++ b/tests/kuttl/tests/dataplane-create-test/00-assert.yaml @@ -62,9 +62,6 @@ spec: - InternalApi - Storage - Tenant - service_net_map: - nova_api_network: internalapi - nova_libvirt_network: internalapi storage_cidr: "24" storage_host_routes: [] storage_mtu: 1500 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 11593073d..977e977f1 100644 --- a/tests/kuttl/tests/dataplane-create-test/00-dataplane-create.yaml +++ b/tests/kuttl/tests/dataplane-create-test/00-dataplane-create.yaml @@ -81,9 +81,6 @@ spec: configMapRef: name: network-config-template ansibleVars: - service_net_map: - nova_api_network: internalapi - nova_libvirt_network: internalapi timesync_ntp_servers: - hostname: clock.redhat.com # edpm_network_config diff --git a/tests/kuttl/tests/dataplane-deploy-global-service-test/00-assert.yaml b/tests/kuttl/tests/dataplane-deploy-global-service-test/00-assert.yaml index 1fd27a376..c134613a7 100644 --- a/tests/kuttl/tests/dataplane-deploy-global-service-test/00-assert.yaml +++ b/tests/kuttl/tests/dataplane-deploy-global-service-test/00-assert.yaml @@ -49,9 +49,6 @@ spec: configMapRef: name: network-config-template ansibleVars: - service_net_map: - nova_api_network: internalapi - nova_libvirt_network: internalapi timesync_ntp_servers: - hostname: clock.redhat.com # edpm_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 629ec70b1..9aff2f749 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 @@ -174,9 +174,6 @@ spec: configMapRef: name: network-config-template ansibleVars: - service_net_map: - nova_api_network: internalapi - nova_libvirt_network: internalapi timesync_ntp_servers: - hostname: clock.redhat.com # edpm_network_config