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]f45e67023c
Change-Id: Ieba1856f60479b04db6f93a26a22e720c0179ba5 (cherry picked from commit25009d7f3a
)
This commit is contained in:
parent
4ff71b0732
commit
7c2355740b
|
@ -69,10 +69,6 @@ mod 'mistral',
|
||||||
:git => 'https://opendev.org/openstack/puppet-mistral',
|
:git => 'https://opendev.org/openstack/puppet-mistral',
|
||||||
:ref => 'stable/wallaby'
|
:ref => 'stable/wallaby'
|
||||||
|
|
||||||
mod 'monasca',
|
|
||||||
:git => 'https://opendev.org/openstack/puppet-monasca',
|
|
||||||
:ref => 'stable/wallaby'
|
|
||||||
|
|
||||||
mod 'murano',
|
mod 'murano',
|
||||||
:git => 'https://opendev.org/openstack/puppet-murano',
|
:git => 'https://opendev.org/openstack/puppet-murano',
|
||||||
:ref => 'stable/wallaby'
|
:ref => 'stable/wallaby'
|
||||||
|
|
|
@ -38,8 +38,6 @@
|
||||||
override-checkout: stable/wallaby
|
override-checkout: stable/wallaby
|
||||||
- name: openstack/puppet-mistral
|
- name: openstack/puppet-mistral
|
||||||
override-checkout: stable/wallaby
|
override-checkout: stable/wallaby
|
||||||
- name: openstack/puppet-monasca
|
|
||||||
override-checkout: stable/wallaby
|
|
||||||
- name: x/puppet-modulesync-configs
|
- name: x/puppet-modulesync-configs
|
||||||
override-checkout: stable/wallaby
|
override-checkout: stable/wallaby
|
||||||
- name: openstack/puppet-murano
|
- name: openstack/puppet-murano
|
||||||
|
|
Loading…
Reference in New Issue