From e170e126dcb77c91083450da0b4cdb786913b115 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Mon, 5 Feb 2024 16:23:47 +0900 Subject: [PATCH] Remove dependency on puppet-qdr ... because puppet-qdr is being retired. Conflicts: Puppetfile zuul.d/base.yaml Change-Id: I0cad57a5800aec3bff53d6ec3397cd7d9886a623 (cherry picked from commit 6d9e28faeff95886ceca9d6260e5809dd4776e63) (cherry picked from commit 96f365b79e38932b7e25b87c975a3d4ecf1fb8b2) --- Puppetfile | 4 ---- openstack_modules.txt | 1 - zuul.d/base.yaml | 2 -- 3 files changed, 7 deletions(-) diff --git a/Puppetfile b/Puppetfile index 6ee2d9bd3..0c0a58f10 100644 --- a/Puppetfile +++ b/Puppetfile @@ -105,10 +105,6 @@ mod 'placement', :git => 'https://opendev.org/openstack/puppet-placement', :ref => 'stable/2023.1' -mod 'qdr', - :git => 'https://opendev.org/openstack/puppet-qdr', - :ref => 'stable/2023.1' - mod 'sahara', :git => 'https://opendev.org/openstack/puppet-sahara', :ref => 'stable/2023.1' diff --git a/openstack_modules.txt b/openstack_modules.txt index fa193dbb7..dba15ce89 100644 --- a/openstack_modules.txt +++ b/openstack_modules.txt @@ -24,7 +24,6 @@ openstacklib oslo ovn placement -qdr sahara swift tempest diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml index bfb7fcddb..229322ded 100644 --- a/zuul.d/base.yaml +++ b/zuul.d/base.yaml @@ -63,8 +63,6 @@ override-checkout: stable/2023.1 - name: openstack/puppet-placement override-checkout: stable/2023.1 - - name: openstack/puppet-qdr - override-checkout: stable/2023.1 - name: openstack/puppet-sahara override-checkout: stable/2023.1 - name: openstack/puppet-swift