DNM: Test patches_path option in kolla

Signed-off-by: Dr. Jens Harbott <[email protected]>
osism · Dec 4, 2024 · d13861f · d13861f
1 parent e244631
commit d13861f
Show file tree

Hide file tree

Showing 15 changed files with 2,995 additions and 37 deletions.
diff --git a/...24.2/cinder/driver_filter_domain_id.patch → ...cinder-base/driver_filter_domain_id.patch b/...24.2/cinder/driver_filter_domain_id.patch → ...cinder-base/driver_filter_domain_id.patch
@@ -1,5 +1,5 @@
---- a/cinder/scheduler/filters/driver_filter.py
-+++ b/cinder/scheduler/filters/driver_filter.py
+--- /var/lib/kolla/venv/lib/python3/site-packages/cinder/scheduler/filters/driver_filter.py
++++ /var/lib/kolla/venv/lib/python3/site-packages/cinder/scheduler/filters/driver_filter.py
 @@ -13,6 +13,8 @@
  #    License for the specific language governing permissions and limitations
  #    under the License.

diff --git a/patches/2024.2-new/cinder-base/series b/patches/2024.2-new/cinder-base/series
@@ -0,0 +1 @@
+driver_filter_domain_id.patch
diff --git a/...neutron-dynamic-routing/bug-2023632.patch → ...2024.2-new/neutron-base/bug-2023632.patch b/...neutron-dynamic-routing/bug-2023632.patch → ...2024.2-new/neutron-base/bug-2023632.patch
@@ -12,10 +12,10 @@ Date:   Tue Jun 13 14:24:23 2023 +0200
     Closes-Bug: 2023632
     Change-Id: I843999d56b9b90af5bd8f4e102e64d261fd483fe
 
-diff --git a/neutron_dynamic_routing/db/bgp_db.py b/neutron_dynamic_routing/db/bgp_db.py
+diff --git /var/lib/kolla/venv/lib/python3/site-packages/neutron_dynamic_routing/db/bgp_db.py /var/lib/kolla/venv/lib/python3/site-packages/neutron_dynamic_routing/db/bgp_db.py
 index 0b9a7db..081c628 100644
---- a/neutron_dynamic_routing/db/bgp_db.py
-+++ b/neutron_dynamic_routing/db/bgp_db.py
+--- /var/lib/kolla/venv/lib/python3/site-packages/neutron_dynamic_routing/db/bgp_db.py
++++ /var/lib/kolla/venv/lib/python3/site-packages/neutron_dynamic_routing/db/bgp_db.py
 @@ -1018,6 +1018,7 @@ class BgpDbMixin(object):
                  l3_db.Router.gw_port_id == models_v2.Port.id,
                  models_v2.Port.network_id == binding.network_id,

diff --git a/patches/2024.2-new/neutron-base/series b/patches/2024.2-new/neutron-base/series
@@ -0,0 +1 @@
+bug-2023632.patch
diff --git a/...te_multitenancy_isolation_by_domain.patch → ...te_multitenancy_isolation_by_domain.patch b/...te_multitenancy_isolation_by_domain.patch → ...te_multitenancy_isolation_by_domain.patch
@@ -1,5 +1,5 @@
---- a/nova/api/openstack/identity.py
-+++ b/nova/api/openstack/identity.py
+--- /var/lib/kolla/venv/lib/python3/site-packages/nova/api/openstack/identity.py
++++ /var/lib/kolla/venv/lib/python3/site-packages/nova/api/openstack/identity.py
 @@ -13,14 +13,20 @@
  # under the License.
 

diff --git a/patches/2024.2-new/nova-base/osism_aggregate_multitenancy_isolation_by_domain.patch.orig b/patches/2024.2-new/nova-base/osism_aggregate_multitenancy_isolation_by_domain.patch.orig
diff --git a/patches/2024.2-new/nova-base/series b/patches/2024.2-new/nova-base/series
@@ -0,0 +1 @@
+osism_aggregate_multitenancy_isolation_by_domain.patch
diff --git a/patches/2024.2/octavia/gh890.patch → patches/2024.2-new/octavia-base/gh890.patch b/patches/2024.2/octavia/gh890.patch → patches/2024.2-new/octavia-base/gh890.patch
@@ -1,5 +1,5 @@
---- a/octavia/common/clients.py
-+++ b/octavia/common/clients.py
+--- /var/lib/kolla/venv/lib/python3/site-packages/octavia/common/clients.py
++++ /var/lib/kolla/venv/lib/python3/site-packages/octavia/common/clients.py
 @@ -80,6 +80,12 @@ class NeutronAuth(object):
          if not cls.neutron_client:
              sess = ksession.get_session()

diff --git a/patches/2024.2-new/octavia-base/series b/patches/2024.2-new/octavia-base/series
@@ -0,0 +1 @@
+gh890.patch
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		osism_aggregate_multitenancy_isolation_by_domain.patch