openstack/puppet-openstack-integration
Code Issues Proposed changes

Revert "Disable Vitrage in Scenario001"

Browse Source 
This reverts commit 96d855444e13ede06e9f1535c371f089d44a1cc4.

Reason for revert:
The issue caused by oslo.db bump was fixed by [1].

[1] d6b5247dbb1acedd43b3dc8e7b1cac06519467c4

Change-Id: I32a2fd6ae9c4498fdfeb53d2b40f7dbcdf839158
This commit is contained in:
Takashi Kajinami 2024-09-03 18:37:28 +09:00
parent a959354fcb
commit 657fa58914
1 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
fixtures/scenario001.pp
View File

@ -34,11 +34,6 @@ case $facts['os']['family'] {
} }
} }
# TODO(tkajinam): Vitrage is disabled due to
# https://storyboard.openstack.org/#!/story/2011061
# $notification_topics = ['notifications', 'vitrage_notifications']
$notification_topics = ['notifications']
include openstack_integration include openstack_integration
class { 'openstack_integration::config': class { 'openstack_integration::config':
ssl => $ssl, ssl => $ssl,
@ -63,13 +58,13 @@ class { 'openstack_integration::glance':
show_multiple_locations => true, show_multiple_locations => true,
} }
class { 'openstack_integration::neutron': class { 'openstack_integration::neutron':
notification_topics => $notification_topics, notification_topics => ['notifications', 'vitrage_notifications'],
metering_enabled => true, metering_enabled => true,
} }
include openstack_integration::placement include openstack_integration::placement
class { 'openstack_integration::nova': class { 'openstack_integration::nova':
libvirt_rbd => true, libvirt_rbd => true,
notification_topics => $notification_topics, notification_topics => ['notifications', 'vitrage_notifications'],
cinder_enabled => true, cinder_enabled => true,
} }
class { 'openstack_integration::cinder': class { 'openstack_integration::cinder':
@ -78,16 +73,14 @@ class { 'openstack_integration::cinder':
} }
include openstack_integration::ceilometer include openstack_integration::ceilometer
class { 'openstack_integration::aodh': class { 'openstack_integration::aodh':
notification_topics => $notification_topics, notification_topics => ['notifications', 'vitrage_notifications'],
} }
# TODO(tkajinam): Disabled due to include openstack_integration::vitrage
# https://storyboard.openstack.org/#!/story/2011061
# include openstack_integration::vitrage
class { 'openstack_integration::ceph': class { 'openstack_integration::ceph':
ceph_pools => ['glance', 'nova', 'cinder', 'gnocchi', 'backups'] ceph_pools => ['glance', 'nova', 'cinder', 'gnocchi', 'backups']
} }
class { 'openstack_integration::heat': class { 'openstack_integration::heat':
notification_topics => $notification_topics, notification_topics => ['notifications', 'vitrage_notifications'],
} }
class { 'openstack_integration::provision': class { 'openstack_integration::provision':
# NOTE(tkajinam): Use raw format to use rbd image cloning when creating # NOTE(tkajinam): Use raw format to use rbd image cloning when creating
@ -105,8 +98,6 @@ class { 'openstack_integration::tempest':
ceilometer => true, ceilometer => true,
aodh => true, aodh => true,
heat => true, heat => true,
# TODO(tkajinam): Disabled due to vitrage => true,
# https://storyboard.openstack.org/#!/story/2011061
# vitrage => true,
image_format => 'raw', image_format => 'raw',
} }