From 29fd5cec5d9a17d6acd47069ea66548dd881efd7 Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Thu, 13 Apr 2023 11:24:16 +0100 Subject: [PATCH 1/2] Drop Glance and Cinder forks Our downstream patches for OSSA-2023-002 have landed upstream. We have one other patch for Nova in Wallaby that has not merged upstream. --- etc/kayobe/kolla.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml index 15f4e243c..217d4d66a 100644 --- a/etc/kayobe/kolla.yml +++ b/etc/kayobe/kolla.yml @@ -123,18 +123,10 @@ kolla_sources: type: git location: https://github.com/stackhpc/stackhpc-inspector-plugins.git reference: 1.3.0 - cinder-base: - type: git - location: https://github.com/stackhpc/cinder.git - reference: stackhpc/{{ openstack_release }} cloudkitty-base: type: git location: https://github.com/stackhpc/cloudkitty.git reference: stackhpc/wallaby - glance-base: - type: git - location: https://github.com/stackhpc/glance.git - reference: stackhpc/{{ openstack_release }} horizon-plugin-cloudkitty-dashboard: type: git location: https://github.com/stackhpc/cloudkitty-dashboard.git From 1cfefbd1a12f18c414546f957b9afb43fb1aa18d Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Thu, 13 Apr 2023 11:27:15 +0100 Subject: [PATCH 2/2] Drop Nova fork Our downstream patch for OSSA-2023-002 has landed upstream. --- etc/kayobe/kolla.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml index 89dd03d3b..b24e68d9f 100644 --- a/etc/kayobe/kolla.yml +++ b/etc/kayobe/kolla.yml @@ -145,10 +145,6 @@ kolla_sources: type: git location: https://github.com/stackhpc/networking-generic-switch.git reference: stackhpc/xena - nova-base: - type: git - location: https://github.com/stackhpc/nova.git - reference: stackhpc/{{ openstack_release }} ############################################################################### # Kolla image build configuration.