From 7c2355740b72d023be44bd9ac31f952b1267666d Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Thu, 19 Aug 2021 10:45:03 +0900 Subject: [PATCH] Remove dependency on puppet-monasca ... because puppet-monasca is being retired. Conflicts: Puppetfile zuul.d/base.yaml Backport note: - Resolved conflict caused by branch overrides. - This backport includes the follow-up commit[1] to remove leftover. [1] f45e67023c0fde517dffd1251cb9dcd57bb1cb7c Change-Id: Ieba1856f60479b04db6f93a26a22e720c0179ba5 (cherry picked from commit 25009d7f3ad04490989c713fee9d3fe72f7a0934) --- Puppetfile | 4 ---- zuul.d/base.yaml | 2 -- 2 files changed, 6 deletions(-) diff --git a/Puppetfile b/Puppetfile index cd6c3132f..d404d9cfa 100644 --- a/Puppetfile +++ b/Puppetfile @@ -69,10 +69,6 @@ mod 'mistral', :git => 'https://opendev.org/openstack/puppet-mistral', :ref => 'stable/wallaby' -mod 'monasca', - :git => 'https://opendev.org/openstack/puppet-monasca', - :ref => 'stable/wallaby' - mod 'murano', :git => 'https://opendev.org/openstack/puppet-murano', :ref => 'stable/wallaby' diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml index c10edec5e..167ec7387 100644 --- a/zuul.d/base.yaml +++ b/zuul.d/base.yaml @@ -38,8 +38,6 @@ override-checkout: stable/wallaby - name: openstack/puppet-mistral override-checkout: stable/wallaby - - name: openstack/puppet-monasca - override-checkout: stable/wallaby - name: x/puppet-modulesync-configs override-checkout: stable/wallaby - name: openstack/puppet-murano