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] f45e67023c

Change-Id: Ieba1856f60479b04db6f93a26a22e720c0179ba5
(cherry picked from commit 25009d7f3a)
(cherry picked from commit 7c2355740b)
(cherry picked from commit 370d3724ff)
(cherry picked from commit 9ea47a0b83)
(cherry picked from commit cd1cf9a2e8)
(cherry picked from commit 52d4f205c2)
This commit is contained in:
Takashi Kajinami 2021-08-19 10:45:03 +09:00
parent 27c130caaa
commit d3b37b5697
2 changed files with 0 additions and 6 deletions

View File

@ -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

View File

@ -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'