From 150e31a06bc1e7a022703e308638a1d0c61fe7fd Mon Sep 17 00:00:00 2001 From: Lucas Alvares Gomes Date: Wed, 17 Apr 2024 10:57:34 +0100 Subject: [PATCH] Remove networkAttachment for ovnNorthd ovnNorthd does not require additional interface via networkAttachment, this patch removes it from the sample files. Closes: OSPRH-659 Signed-off-by: Lucas Alvares Gomes --- docs_user/modules/proc_deploying-backend-services.adoc | 1 - docs_user/modules/proc_migrating-ovn-data.adoc | 2 -- tests/config/base/openstack_control_plane.yaml | 1 - tests/config/periodic_ci/container_image_overrides.yaml | 1 - tests/roles/ovn_adoption/tasks/main.yaml | 1 - 5 files changed, 6 deletions(-) diff --git a/docs_user/modules/proc_deploying-backend-services.adoc b/docs_user/modules/proc_deploying-backend-services.adoc index fd0c471a8..c5cab8518 100644 --- a/docs_user/modules/proc_deploying-backend-services.adoc +++ b/docs_user/modules/proc_deploying-backend-services.adoc @@ -244,7 +244,6 @@ spec: storageRequest: 10G networkAttachment: internalapi ovnNorthd: - networkAttachment: internalapi replicas: 0 ovnController: networkAttachment: tenant diff --git a/docs_user/modules/proc_migrating-ovn-data.adoc b/docs_user/modules/proc_migrating-ovn-data.adoc index 48af4fba7..16f8947c5 100644 --- a/docs_user/modules/proc_migrating-ovn-data.adoc +++ b/docs_user/modules/proc_migrating-ovn-data.adoc @@ -124,7 +124,6 @@ spec: networkAttachment: internalapi ovnNorthd: replicas: 0 - networkAttachment: internalapi ovnController: networkAttachment: tenant nodeSelector: @@ -177,7 +176,6 @@ spec: enabled: true template: ovnNorthd: - networkAttachment: internalapi replicas: 1 ' ---- diff --git a/tests/config/base/openstack_control_plane.yaml b/tests/config/base/openstack_control_plane.yaml index de3c1606f..769cd30e1 100644 --- a/tests/config/base/openstack_control_plane.yaml +++ b/tests/config/base/openstack_control_plane.yaml @@ -109,7 +109,6 @@ spec: nodeSelector: node: non-existing-node-name ovnNorthd: - networkAttachment: internalapi replicas: 0 ovnDBCluster: ovndbcluster-nb: diff --git a/tests/config/periodic_ci/container_image_overrides.yaml b/tests/config/periodic_ci/container_image_overrides.yaml index 085b78fca..d8e01c8b7 100644 --- a/tests/config/periodic_ci/container_image_overrides.yaml +++ b/tests/config/periodic_ci/container_image_overrides.yaml @@ -94,7 +94,6 @@ spec: storageRequest: 10G networkAttachment: internalapi ovnNorthd: - networkAttachment: internalapi replicas: 0 ovnController: networkAttachment: tenant diff --git a/tests/roles/ovn_adoption/tasks/main.yaml b/tests/roles/ovn_adoption/tasks/main.yaml index 823fbe9d7..21c83aef5 100644 --- a/tests/roles/ovn_adoption/tasks/main.yaml +++ b/tests/roles/ovn_adoption/tasks/main.yaml @@ -180,7 +180,6 @@ enabled: true template: ovnNorthd: - networkAttachment: internalapi replicas: 1 '