Merge pull request #836 from slagle/service-net-map-cleanup

More service_net_map cleanup
openstack-k8s-operators · Apr 18, 2024 · 6c22275 · 6c22275
2 parents 4658d68 + 6ef58e6
commit 6c22275
Show file tree

Hide file tree

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