From d3b37b5697d955843d4b4780d9b6a379cdaaac85 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
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.
- (Rocky and older) Resolved conflict caused by centralized .zuul.yaml
  used in older branches.

[1] f45e67023c0fde517dffd1251cb9dcd57bb1cb7c

Change-Id: Ieba1856f60479b04db6f93a26a22e720c0179ba5
(cherry picked from commit 25009d7f3ad04490989c713fee9d3fe72f7a0934)
(cherry picked from commit 7c2355740b72d023be44bd9ac31f952b1267666d)
(cherry picked from commit 370d3724ffbe377bfbb58c5cad6a5bd0ed716f1d)
(cherry picked from commit 9ea47a0b834b25765d7c3c4a1a0bd86834166294)
(cherry picked from commit cd1cf9a2e8fe3c1dccdf4d821a1328e7ad823958)
(cherry picked from commit 52d4f205c22d559f6adcf83e88eb9e73cfc774d5)
---
 .zuul.yaml | 2 --
 Puppetfile | 4 ----
 2 files changed, 6 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 2476a393b..713e901fe 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -51,8 +51,6 @@
         override-checkout: stable/rocky
       - name: openstack/puppet-mistral
         override-checkout: stable/rocky
-      - name: openstack/puppet-monasca
-        override-checkout: stable/rocky
       - name: x/puppet-modulesync-configs
         override-checkout: stable/rocky
       - name: openstack/puppet-murano
diff --git a/Puppetfile b/Puppetfile
index b09941d64..0cc02b285 100644
--- a/Puppetfile
+++ b/Puppetfile
@@ -65,10 +65,6 @@ mod 'mistral',
   :git => 'https://opendev.org/openstack/puppet-mistral',
   :ref => 'stable/rocky'
 
-mod 'monasca',
-  :git => 'https://opendev.org/openstack/puppet-monasca',
-  :ref => 'stable/rocky'
-
 mod 'murano',
   :git => 'https://opendev.org/openstack/puppet-murano',
   :ref => 'stable/rocky'